gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /app-emulation
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
41 files changed, 672 insertions, 104 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1fbe75d4c6d5..663c53dd9e3c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index a5b501894b17..3e6042baef71 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,7 +1,3 @@
-DIST diskimage-builder-1.28.0.tar.gz 267409 BLAKE2B eec9e9bfba8ddbd31ec1af8fac401c64019c72c19982e7d74eb20f1056571873f5ed8198809b7ebd2ef87deb757a9a81b5a1ec23c83876abed659c1196df2cb0 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f
 DIST diskimage-builder-2.10.1.tar.gz 338370 BLAKE2B d2417af55924971ac6c8ee803c7c9bf788ecd9a16affe90077eff51a58924c81e82728eef344749b5687cc26ff9e355a7611f4e2a0a5501217344eb9bca2bb00 SHA512 4c9ff1b7182b3c207d769bdcd142f23a6d9e2a8f040694ab75d41284bb96ad07305ae78e486343f22d13d8c8cbef5c66eaaf4638f0fd8f7158cf3520da587e88
-DIST diskimage-builder-2.9.0.tar.gz 319035 BLAKE2B 846b2f35533efb66c22adb461b849352f17a8555998cf689756c513093d244c714a8e7b8ad7da4fada2b5da9ef3c2ac42f3247568b207e342a71d2ba677abda3 SHA512 ebaeb1d5396977d8391f7c718ff13e7b0d37aca58ff14719e2b5f17adc376e85f15f516f63c245c2374e363d4037bc358192aa87ce0515d0a69cb00ac5b616af
-EBUILD diskimage-builder-1.28.0.ebuild 915 BLAKE2B d638fe4c224637b57c370154ba190f9e6ef0a1e6ff33db7d9699238fea253d6833fa82a012a16bd33add79ec251e12a4a097812de2af579955ed042b7c800c5b SHA512 eb129f8527f64dbaf9f207512b4cb0b5384c546bdda76f9b3c5df4f23b276c6c33ffc4ca7dce9441db97af3cb7216d87c1040dbc85aa6dbb33edc15e24996955
-EBUILD diskimage-builder-2.10.1.ebuild 1102 BLAKE2B e46754ab805eb5ee798c4b5d1e0e1670d67e7c7f9ec3b6baad90786d5552ee914f31f3603f33b9f641629ab3860bcfbd84a1b4b73c95f3b3159d13a3967741fc SHA512 7e6d8694f39a60ad0d9f732af70ee37374361fcad94747caaabf83093b6c85daee790bac5c618770e8efcbcda53999cf6528efa523da6090666c7f14573f5f36
-EBUILD diskimage-builder-2.9.0.ebuild 1099 BLAKE2B 597d2d906519e42687e8ba98c6bbd203d10a8cde757de9c26282f3b6995fad231ca69d6fe6351d2568644b4fd25e3dbd3b3e67b4ac2d3363ffda8600f040e3fa SHA512 0b928a1ca2490eb143bea0d10e9bacf9dd63b8aa82340c72ddad7b3cd6aabe23673390878a75e80aafea6e00b0c19f344dfd5b957780b6e5371012e5b8e6bc1b
+EBUILD diskimage-builder-2.10.1.ebuild 1100 BLAKE2B 204c7a4b2bd37127b7f5187b55279195ce48c2b93fbcfc1b15d720648df6b0831121ba6846f08abad4c94f5ae5ab433ebe8cbf53bd35c9a9df00a6241f96fbfb SHA512 34488e929ade8540d8405adf071fb9e81dbffd4ae6efb24fa978fc3c407c739c7381898cc3e2639d8310f39f9af40507a10ed163798151e426a0579cd58a6b9a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild
deleted file mode 100644
index c5371ab9162a..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	dev-python/dib-utils[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
index b7ce708c6881..dfe685ce8092 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild
deleted file mode 100644
index 1bd01d9d3360..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 10c6df8bd6ce..d1ac1c74d190 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,6 +1,8 @@
 DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 BLAKE2B a752ad0170cab2aebe2d5e826db22f5e21135a8fbfa835f62804c303be9f136fee941942e7d07e82e19033a62d51f37a41e9c36b48df48947d2885c351584f4f SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
+DIST docker-proxy-0.8.0_p20180112.tar.gz 2679651 BLAKE2B aa134607a90029b41f12885876f175e0e4d77de7e23888912e561d2a75056a8b85f8bb31bfc27e5ddcb102d7d113720ecf4796d7c7d6f6a4c5db10c5f4c60915 SHA512 43d7a8259b5ee2f605ae07dfe64e25b90445b9d38b279a19366df64093dc7d16f3820e3cd67c8569292efc548334a278f1fcbcfb13aed3a73ba980309f8115c9
 EBUILD docker-proxy-0.8.0_p20161111.ebuild 811 BLAKE2B 52fea3672054a214e08d3bf0f5392ec40620eb21c90e2b1535ce2ae327f544b6c852df93eb799217f42d4baaed927df7a266e12946d8efee84c5871471795d00 SHA512 f9fbd5faa13fc3f32fa8b23188dc242b11a8e7933a382552e80d0cc17dae3c2c2302ff42a0502acf55fd660bdbd4cb6e82f60ad977b0ed31873509ffb3a18462
 EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79
+EBUILD docker-proxy-0.8.0_p20180112.ebuild 822 BLAKE2B f8f3312acb874b0bcddd41baf9b363bc7c38b3005579048e75d7fe0cf21888898f4949c7ffb74a368134102b5ad381e875482a9a9110b38c1b752bc890fb5e49 SHA512 20c4645ac28cd33724412ce0214ee69b281dce03bf85a6a95c4f81ac88448c38287e369a1a4b4d10848fd986fad122e75775267ea7e060a39475b6f3ca646829
 EBUILD docker-proxy-9999.ebuild 767 BLAKE2B f78b475830edd0e33139d9f46a75629b9375ca1c2efc0e5e6c78447fd2bded0f2d1face48e8a0a8da92f6ea724eec843d2d96eb8e94a6881615926ceab6811df SHA512 07c829f9d6e5a2c64512fba2c6cef66bf33e15818d905f9b9fb3e412a98d651ac32c2fb9c07da57c7f8de963c4919f621021929375adf72afa485da9a69051ed
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180112.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180112.ebuild
new file mode 100644
index 000000000000..7341a02ad2aa
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180112.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="fcf1c3b5e57833aaaa756ae3c4140ea54da00319"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!<app-emulation/docker-1.13.0_rc1"
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc ROADMAP.md README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index 895a006b4864..8492dad29046 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,7 +1,9 @@
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 BLAKE2B fed7b3cb3bbf214c61f9bc84752f143de9f18aa1ad1720c80df171eaa82f545cdafdbd58f64ee21e05db67f7fcfa139622fc8356aa7584db87b72d46e3285907 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d
 DIST docker-runc-1.0.0_rc4_p20170926.tar.gz 1188421 BLAKE2B ba21aaed4c434358876e9a1656a0592e5df90e16ebd52b69a2ddd3344aba2db5e335de1c88aeed27101ec5441174da148d0da02ade0b517d36d45e0aff53ca9e SHA512 bad4643ce37dbba168cc3b0820cf7dc8166ff2d7970de519f86ca09123b59999174dd98b7bc550b714dc8235732923e0090031c789deb603f310e042a39f1d76
 DIST docker-runc-1.0.0_rc4_p20171108.tar.gz 1189298 BLAKE2B e213955ef59e7d5a43f1567c67d72b99d7de503340ed8c777a43a70c4f2b1dbfce2905377c912958f736cf31247334d1c2ab29fae203a297561c26ad43a4e4c1 SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695
+DIST docker-runc-1.0.0_rc4_p20180122.tar.gz 1184954 BLAKE2B faf07c06c12301588d9adb1bfd31d562b31cd1119f1247b06afb2d6eba077c37a8871bd32d48e20b79f1b91fd052ec54fe6da5ac8c51713c9757e1967db563c3 SHA512 c7b24ca6212ce500d1d4c3a1776be5ca116d4f005d71e5fe8f2228c26f039058f3dd1071e9e39aa9c93272a49f7ff2ac86e2fbbcf6115cc3de65a370127d8ea5
 EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1385 BLAKE2B 03aab7b27952ff4dc2e1e84c6e3edb599b03df34dc1a82c7b7cbff6a3f36324cd191e723f4700c58761f221b395f443ba84a09ed5310af15d35a3bbbc43ed7a8 SHA512 466f519c03e8df4d71bf9b95149d9e4e15ed0858b999840f7d80d8ad9ccb7339b25a726451d9f08e4820ed09a6cd873e1d21a1de6e041d23202290a7da3e98cc
 EBUILD docker-runc-1.0.0_rc4_p20170926.ebuild 1385 BLAKE2B 90e1005077667c7f2f4b1e77543d50d266cd0fcddb020dc3a349c7071beacf2a9d5ae2ebdd88a79870684700fb843860e2c9c2257dd08928b28f84a62c10092b SHA512 91b1981d8660f91d376662ffbc87ef7afa77e00adeae8a87b8014093e930669f5d7da38710a41c227619ff30b22fb6e5bdd8fd8128366ebd07f4883dba4be88d
 EBUILD docker-runc-1.0.0_rc4_p20171108.ebuild 1385 BLAKE2B 02cd7e8361f69cb4e37bc97f81c1069e2ef9928ce335bcddc1755a32e0a67a77f236e03fe6126db4870122a0d9798b925b463e6616ff29c719d05674e8de3ab7 SHA512 fddf7cb0b5df213c14d5d832c683e8b5721c54c5f787688b08ff106561724d1e5cd4223b266ef71e1419ab248eddbfeb5d96909139105c4f83c39192e6fe0e32
+EBUILD docker-runc-1.0.0_rc4_p20180122.ebuild 1385 BLAKE2B 5376eec62a08bfc84ce8e8d28756346a199ee49518d8b9ddb0d33298d7da336e4a23325cb540e7a2c93632635855ad4ef7d98785468eb97d1179663ae4950b0e SHA512 f4beb4d99995620bc7ba4871c18509385ff0a588e3327cf75ecef72d844f2b5876e382b6ff166ea41b5251e820eaeaecc72efb35b2f645e37536c3e342c790b2
 MISC metadata.xml 627 BLAKE2B af677935e5cb5c43d3b0e4d8a204bcfb14f4b77dc386fd2a756923457ae88cdc33fd85a84879b7908662c3c1b20ce0ba5598ae708d764bd36a071e32d9beb2c8 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20180122.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20180122.ebuild
new file mode 100644
index 000000000000..ac5fcf94919e
--- /dev/null
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20180122.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/opencontainers/${PN/docker-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	EGIT_COMMIT="9f9c96235cc97674e935002fc3d78361b696a69e"
+	RUNC_COMMIT="9f9c962" # Change this when you update the ebuild
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools (docker fork)"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/runc
+"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse.*\$/echo gentoo)/" -e "/COMMIT :=/d" -e "/COMMIT_NO :=/d" Makefile || die
+}
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient' '')
+		$(usex apparmor 'apparmor' '')
+		$(usex seccomp 'seccomp' '')
+	)
+
+	GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
+		COMMIT="${RUNC_COMMIT}"
+}
+
+src_install() {
+	dobin runc
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 993f735e9f85..fe63a24f08cc 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,8 +1,10 @@
 DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
 DIST docker-17.12.0-r1.tar.gz 11008332 BLAKE2B 95a95bdf64bc6d6aa7a60d515d5661589c0e94ba687d5d766010579a5511dc85f2675dc2b22d628b153ef6fc018be9015ea80a4bcdaea4c10689a7c70eddea79 SHA512 7381bddf4b2538b2b76229d962925eee74a38ddbb18a6f988ccff2a2ce0ef334148ea76d9697e89acc6c9018cb6f785b59c27450dfb930ead01fa5684c6a90b1
 DIST docker-18.01.0-r1.tar.gz 12530532 BLAKE2B 4fe85e5522a45f14dac343714c3ac5f7be3ccf710b54bb09ba06fb728d40d874c67140991aed62f2e5f0e9a66153f1953d2d29288775b707f2a27702685ad5e7 SHA512 e58b23200df811549d8c2ba4b915458b3496b982b264f0aa0ff8c6406e0deb20af2180ea20ac1eaab35cc2a14bea98d6d14d197fdeb54f8c7949dc1b6a336872
+DIST docker-18.02.0.tar.gz 12659242 BLAKE2B 0aac95ec6e6cbf980ec163cd40d9646207ef46df93dab9dab397ddc9a5a29addd25c014b810056a48f7498b5e2cb0d5772f99eed0b2b4d12eac815822ac22609 SHA512 4d1bd0ffc893e70fc524f46cacdc4ab035d8b7e0fd7e8de9faf6d9c30b9920b68a99764101e47a8375425b774fe93c317213509b2d1ace87c7598b2b939b849b
 EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
 EBUILD docker-17.12.0-r2.ebuild 8810 BLAKE2B 81f3030489b812d1f1773458a88a6100e285f882ce516ad95b335a84ab8d829143ad793786a8c6af67abda4a4fd0e4ce5e1be0e0d27c2fce2b35ebc54ce5f6a5 SHA512 b99df673d64bca410bc02bed15ead277c8715cf7a753f75b1e543b3f848bcdee5d1b6632c06198173bcf039cfe1f318c8e024a7198d5364db902973aa5614915
 EBUILD docker-18.01.0.ebuild 8810 BLAKE2B 81f3030489b812d1f1773458a88a6100e285f882ce516ad95b335a84ab8d829143ad793786a8c6af67abda4a4fd0e4ce5e1be0e0d27c2fce2b35ebc54ce5f6a5 SHA512 b99df673d64bca410bc02bed15ead277c8715cf7a753f75b1e543b3f848bcdee5d1b6632c06198173bcf039cfe1f318c8e024a7198d5364db902973aa5614915
+EBUILD docker-18.02.0.ebuild 8807 BLAKE2B 14b1a57179ff2b0faa384521e1e31ca6d947cc511121af3969a35517dd5e1247195e76cac103a731273b0dfb747c2a7963b87cff5a824de8cc67b449a0774101 SHA512 ff2bd5edd6787e69de06cb4ecb5d162fa0c580345432e160cf4ac1848c1348389c53f4e5206f34432106ac0c5c5682fc0ce8dfd6970d498ff442708cac5f2589
 EBUILD docker-9999.ebuild 8077 BLAKE2B 8b65d3c59a41acd2020f1a43cf79bea2871fb7b911170741eb3c217e9acd4a5a24b2c2e204e3635cac3e392c72bdafc332b25fe0613991e37cb3d7c55700d399 SHA512 1fb9025bd12796909a623a3ebc9da52e4e8fd73d11f60e25907530fcb62039d7dcf580e4e6f22f103cf1a07aee8bfd6975fa11bd0829952d23613d4ae7ade9c4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-18.02.0.ebuild b/app-emulation/docker/docker-18.02.0.ebuild
new file mode 100644
index 000000000000..8fdca0531b78
--- /dev/null
+++ b/app-emulation/docker/docker-18.02.0.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	inherit versionator
+	if [ "$(get_version_component_count)" = 4 ]; then
+		MY_PV="$(replace_version_separator 3 '-ce-')"
+	else
+		MY_PV="$PV-ce"
+	fi
+	DOCKER_GITCOMMIT="fc4de44"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.1
+	~app-emulation/docker-runc-1.0.0_rc4_p20180122[apparmor?,seccomp?]
+	>=app-emulation/docker-proxy-0.8.0_p20180112
+	container-init? ( >=sys-process/tini-0.16.1[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+	~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index 25946987e203..2460ebdfb6e6 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -4,8 +4,8 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f
 AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
-DIST flannel-0.9.0.tar.gz 8090296 BLAKE2B f3592a9d448219683a1d34c5c291206ebb331b801455fd4bc3c1e7909576d865943cad9e6c79915bb6be5d8fd47d910a4fb550a1352ea0a506f90dcf2312964c SHA512 b91a3da1b69c806d9af87d4c5f8702c845b328978e375d957bbb8dd3eeb35547cc63f8f13bef7520a8e012e4e958a7c6ca047d0b06a1f9a0e31f61ec2be40a4d
+DIST flannel-0.10.0.tar.gz 4799262 BLAKE2B 7341f34f72bf2d51aa727d03eb94f376fd9da825dea1865db9d0b46d5bcc0338569b8aa81c3442b101768cd7b58bef3957bea86a38e8c1cca921b7a03d1b2bf3 SHA512 b71fff80f7c4891279e82c6c430cdbff1eb3966cc4817d1c2c5ed7a731e9466f04e51532734244510ab47cba07557c052fbaa9a4a9ecced56fa1e37f6681b1c9
 DIST flannel-0.9.1.tar.gz 8090942 BLAKE2B 94da69c9ef82438a55a238910130beedd55418d1f2a1a9e0d49b36fb5626b9346b4b1dbb46dfdbb839e6303a9906521c5e7bfa7ca695455d1b40167f3245c05f SHA512 ce265effa1924dbd2fa366cf97945ec94ecfc5701dfbaae2d44d1177a36b5e2268b1d9535f2d5dccd84ebb50d8cc8844c46f025fa1f233f85f6dfa0a30d53fe3
-EBUILD flannel-0.9.0.ebuild 1403 BLAKE2B f45390522d39d49fb33487bdeee660b0f02d7c1a324bcc25e6f24f6c1f99a30df653b3fa155f7799ef450e2ee501fda8558734e8c537ecc2a9bf7ea1df362659 SHA512 d4154712b76066d0c88c2308f38f14101a4713c6dceb8330bed71b4d3b2c53655197fd09454e8d710cd29e050c3734bfd0a85bc9141d8bbc2af202c8859116ab
+EBUILD flannel-0.10.0.ebuild 1403 BLAKE2B 669a75baef87e9c5cf6f8c221f3a16e91dfc15b9dcb59d06fc1a2f1790e07b52ebaa47c970c1a046e88caad122beeb83bf3ebecc6c70db143287ee6417710ec8 SHA512 2ba72e8c1f358224876b5ad2504a8cfe12b7d748a1038c69eac03b1d6e43f10473ac1b2cfa2c6daa32728004526f82b064f842fa82256e01473e5b7c2e0ddf6b
 EBUILD flannel-0.9.1.ebuild 1403 BLAKE2B f45390522d39d49fb33487bdeee660b0f02d7c1a324bcc25e6f24f6c1f99a30df653b3fa155f7799ef450e2ee501fda8558734e8c537ecc2a9bf7ea1df362659 SHA512 d4154712b76066d0c88c2308f38f14101a4713c6dceb8330bed71b4d3b2c53655197fd09454e8d710cd29e050c3734bfd0a85bc9141d8bbc2af202c8859116ab
-MISC metadata.xml 305 BLAKE2B d34792ab0473ba56a75b4e9dc559b4a12b2eed48313cfecac65ce7b13a9df59a651721fbdd72a744314181f4002b52510c9200b85c1fac6fa03d3d78573db842 SHA512 ff219bf7233d4659475fd4e25366d5eef5d3575cd1250d6c9bbddc7351515418ca17730a8df61d102c71b515813b20bb182b355448db16b5fb43a9a46401bd04
+MISC metadata.xml 417 BLAKE2B e6ca7a068ab883a47cd7bd9d1fcad86c0e2e76304225d17c1aa1f02ebed1fd58bd885e8484873b6c900717e78a7398339f49f5fd74f100467c7d09b5b5800bff SHA512 f776dd802b80a94b819998c46ce5adcd163942fade01f13b3ea6c718bab1fcc6b08cdd0630f51fea305deb760fe9e8b3dd750dab3b2d1e3b2c6a257e7d4b1595
diff --git a/app-emulation/flannel/flannel-0.9.0.ebuild b/app-emulation/flannel/flannel-0.10.0.ebuild
index 5135efe94f88..3fd362881d8c 100644
--- a/app-emulation/flannel/flannel-0.9.0.ebuild
+++ b/app-emulation/flannel/flannel-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-emulation/flannel/metadata.xml b/app-emulation/flannel/metadata.xml
index 26007a60b41b..cfe71d5ee793 100644
--- a/app-emulation/flannel/metadata.xml
+++ b/app-emulation/flannel/metadata.xml
@@ -4,6 +4,10 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">coreos/flannel</remote-id>
   </upstream>
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 5cb7334bb9a6..d7f762792d5f 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -7,7 +7,9 @@ AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493d
 AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167
 AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
 DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6
+DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B 31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6
 EBUILD libguestfs-1.28.5-r3.ebuild 3754 BLAKE2B ca8d0cdcb60e7ba34805c64c932e2f06cbd72bbdca8e7777744a37cd43a69bb6964db5f72835d7473c505450396a6f2fa544ffc17a856e541561ce95fbc1acce SHA512 098c67112a8ff3c648351c060837154cb4ccb666ddb056a6e54ee4901e3d7e9b78e20bd73cef7fcd6895a248522242456bd721ab9123faf4e09dc3c6cd6631bd
+EBUILD libguestfs-1.36.13.ebuild 4147 BLAKE2B e28d2e8f24026cecfaa5d5debc539e844e9f0f943f2a43fde1f8c177dd4331a17e296d5c6ca4c45f5701543bcbf9938bc507a3989d582d9be8bbcd2cc8c83c5e SHA512 cb223b885822b06b808f13c4491f040810ff6a249aa8b0980b39b49acf18efcbb61facffda559e6f53139f52b301812161e83cd18d90408b4b214681c62b3311
 EBUILD libguestfs-1.36.5.ebuild 3877 BLAKE2B 6f64972ce85db716ae89a73c7f27248c9fcd8427e2eabbeb277a887b27937756463057805287ba955430b37561e034fa40f020ff32539ba77b9b7b9b5a7dd2b0 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2
-MISC metadata.xml 894 BLAKE2B 30fe5dbc28d2bdaf099d2fd6b2d94ec235c060f7d661e41dadd3aa7857f56926972394a86f039853a1dbd8bd1f47bfbc7c6cb8b0e61efe6410390a75a84f71af SHA512 ec4e41f3143e4f8128e59188cbd0a105d22c5f28d8c388489bd71177d6c0084b798a2d127308cc1e04406a5fe9cfb143dd5aaf3308dd1422f82a561abeae13af
+MISC metadata.xml 1002 BLAKE2B 993cf56b6beea1ff609bf9be15d981426357cdaa15c5c6af9a054dbbb241bb2a12e0bb84b7f5f171ba111bd68545254f197c65b5f8956af4facced3bc1d9fc65 SHA512 56525b6489f81fd7555f5953e5ca0ccb468831a433264326f8cf2dee18f8bc5d12a6c479e7fed9c252d17d87efeebac77c0543e4e19207d0e8f720789bd68ce8
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
new file mode 100644
index 000000000000..16835babf72e
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -0,0 +1,173 @@
+# 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}} )
+
+inherit autotools linux-info perl-functions python-single-r1 versionator
+
+MY_PV_1="$(get_version_component_range 1-2)"
+MY_PV_2="$(get_version_component_range 2)"
+[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+HOMEPAGE="http://libguestfs.org/"
+SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/"${MY_PV_1}""
+
+KEYWORDS="~amd64"
+IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Failures - doc
+# Failures - bash-completion, see GBZ #486306
+
+# FIXME: selinux support is automagic
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre:3
+	app-arch/cpio
+	dev-lang/perl
+	virtual/cdrtools
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+	sys-apps/fakeroot
+	sys-apps/file
+	app-emulation/libvirt
+	dev-libs/libxml2:2
+	>=sys-apps/fakechroot-2.8
+	>=app-admin/augeas-1.0.0
+	sys-fs/squashfs-tools:*
+	dev-libs/libconfig
+	sys-libs/readline:0=
+	>=sys-libs/db-4.6:*
+	app-arch/xz-utils
+	app-arch/lzma
+	app-crypt/gnupg
+	app-arch/unzip[natspec]
+	perl? (
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		virtual/perl-Getopt-Long
+		virtual/perl-Data-Dumper
+		dev-perl/libintl-perl
+		>=app-misc/hivex-1.3.1[perl?]
+		dev-perl/String-ShellQuote
+	)
+	python? ( ${PYTHON_DEPS} )
+	fuse? ( sys-fs/fuse:= )
+	introspection? (
+		>=dev-libs/glib-2.26:2
+		>=dev-libs/gobject-introspection-1.30.0:=
+		dev-libs/gjs
+	)
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+	ocaml? (
+		>=dev-lang/ocaml-4.02[ocamlopt]
+		dev-ml/findlib[ocamlopt]
+		dev-ml/ocaml-gettext
+		>=dev-ml/ounit-2
+	)
+	erlang? ( dev-lang/erlang )
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( dev-lang/lua:* )
+	>=app-shells/bash-completion-2.0
+	>=dev-libs/yajl-2.0.4
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	net-libs/libtirpc
+	sys-libs/libxcrypt
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	doc? ( app-text/po4a )
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+pkg_setup () {
+		CONFIG_CHECK="~KVM ~VIRTIO"
+		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+
+		use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
+	eapply "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	econf \
+		--with-libvirt \
+		--with-default-backend=libvirt \
+		--disable-appliance \
+		--disable-daemon \
+		--with-extra="-gentoo" \
+		--with-readline \
+		--disable-php \
+		$(use_enable python) \
+		--without-java \
+		$(use_enable perl) \
+		$(use_enable fuse) \
+		$($use_enable ocaml) \
+		$(use_enable ruby) \
+		--disable-haskell \
+		--disable-golang \
+		$(use_enable introspection gobject) \
+		$(use_enable introspection) \
+		$(use_enable erlang) \
+		$(use_enable systemtap probes) \
+		$(use_enable lua) \
+		--with-gtk=$(usex gtk 3 no) \
+		$(usex doc '' PO4A=no)
+}
+
+src_install() {
+	strip-linguas -i po
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+
+	use perl && perl_delete_localpod
+}
+
+pkg_postinst() {
+	if ! use gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
+	fi
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+}
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 44378eae0f76..8a1be2d16af7 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -10,6 +10,10 @@
 	<name>Richard Jones</name>
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
+<maintainer type="person">
+	<email>eva@gentoo.org</email>
+	<name>Gilles Dartiguelongue</name>
+</maintainer>
 <longdescription>Libguestfs is a library and tool set for accessing and 
 modifying virtual machine (VM) disk images</longdescription>
 <use>
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 210710871b9d..1ced4ddbb6fc 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,4 +1,4 @@
 DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04649db02192ef9c80bf42214a112a050a9f054c81549a114e7a1236c86e0066e8002f0c7f09317abb672fe5f6a76789 SHA512 72f53a90d3e40aa93d4afe5b29f631afe859532fbdb4e27086da3bd4cdaf0fb25fc808a82a1994b7c2648a1e864876ce95de28acb3b4876dac47b0f4d1c97ba5
 EBUILD libvirt-glib-1.0.0-r1.ebuild 1014 BLAKE2B 7e26b59844df689ae0cf1c791ebc61d046eb45afdc014708ae3283a771a537bfc2aa0025cb2379d5bdaa20e4147385cda057a93d7423d7b26a11973878e1d4cb SHA512 fbb757c3e5fe6dc894be136fde13e177704c7fbc1bc5f46dd5a5f64708966fb0919e187ca501335fb3a736e37df26936a22b286a9176f8d6368a44ab6a55b6c7
 EBUILD libvirt-glib-1.0.0.ebuild 1234 BLAKE2B b6429e7d6151f44ac3af8db66a43984be934dc01de02cdaf45fce08721a12f63bbd84177bf1a2b847e22ea4c4c5ab800cc308d481dd09a97c68b05365bea4148 SHA512 71973f3d5429257a7434977aece98e2041f0bdada1466324c08c1453a597d0df72249f070e90aeaf987e56a5a18c2f7f3c62cd05a0d19c60602213882f10ed49
-MISC metadata.xml 402 BLAKE2B d617a9b473779fd1c9b98c3cc11200b4bd20c80bba4d32ca0ddc5838dde976b417b80e58a8334e2031ea7942b98b9b2a446543e8b89dbe4d101e34238e61a026 SHA512 691831812e2925983c3fc4f3b40d3395d12d3a22db50af65237c1221e985f6fddc7745c3c68a29099d523cb619b7a1cc0f30106435c7bfc7b8145e4e62560f01
+MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/metadata.xml b/app-emulation/libvirt-glib/metadata.xml
index f329d3b934f5..8f96b900ccf3 100644
--- a/app-emulation/libvirt-glib/metadata.xml
+++ b/app-emulation/libvirt-glib/metadata.xml
@@ -8,6 +8,5 @@
 <maintainer type="person">
 	<email>tamiko@gentoo.org</email>
 	<name>Matthias Maier</name>
-	<description>Please CC me on bugs</description>
 </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index f98264f71a67..2efacf6bd16e 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,3 +1,3 @@
 DIST sen-0.5.1.tar.gz 70930 BLAKE2B 93758076d014a36996ece021f1de2f3ece749453d32554fe79ffec0ab1101bf4cc5c11d80934817fa5b10d73b811e738c87ce8e745a642507ec8406ad2eb59fa SHA512 0faf2c12e6361d3b4e9d093e0830867976a1fbd03cadc7a527c88460244532a8b636d8d4b732bb0c7f4041a0bb0819d20caabe62327b5edbf731b4eb8a4898a6
 EBUILD sen-0.5.1.ebuild 595 BLAKE2B 76669d2b34f8994b481cc47f24e0fae868c1b596c447bdef2ed1fd51b549247ece387a661b06b1b3debb6aeb710b004d34d31f15d34f7abfb8b83df7e27c939e SHA512 1457afdb838181f49937694888338a855b0bae92e8072454f6b44378cfd4024121ae38e39eb7704ffda2d33df7145e9fdcfc9b3c2d5c30c7b5ba2ed764ffb2fd
-MISC metadata.xml 589 BLAKE2B a67222b664be8fe6f026e79553be402ae89de429f88aada6ef57cfa86a5887f502159557e656175b9c299daf41a5fbe75e86a5f1b79f4b43dc106776943e6962 SHA512 97b2946ac6806e2a0750f1a4bbe3394bb54818f6437ffa21fd4b183f3b0b209842a89c3bd880a03a4e742cddce8a1ea75edf515857c3f5546b86418e5dee7b24
+MISC metadata.xml 481 BLAKE2B 05f7d4737d46f7302755f9031350dcd294d54d80221e10e2d35cee01e104fc6ecb138aa775989ceb6d3da573d82f23f50c23ba585183ee7d7df06da4f6afecce SHA512 d008de529287e951542d65829f60d7cd14e9ccfce614d8b5e77f745e9a1882e325d776b7aeeed4a620f542040f331cf49f1e258e58a8403b33074266a637807c
diff --git a/app-emulation/sen/metadata.xml b/app-emulation/sen/metadata.xml
index 008b9f23e794..c2f5606901a3 100644
--- a/app-emulation/sen/metadata.xml
+++ b/app-emulation/sen/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
-		<description>Proxied by Polynomial-C</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
-		<description>Proxy maintainer for Nelo</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">TomasTomecek/sen</remote-id>
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index bcaaa48024bf..f16336aad069 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -9,4 +9,5 @@ AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 EBUILD ski-1.3.2-r1.ebuild 1223 BLAKE2B 86e9539fa5d55cee2b8b6ae9da37b62728f4e64c4a6fbf06cb88202609f162e813aa42165f0983d75014dd871210c3c71b5e0af4d2743ea3534af53bea58c74b SHA512 642a6e1351ef8cf984a7c842a62347183afeb23174ba7d7972301c7a6514311a00e5e9b009206d14d1a2a15b194784ff4db0d7376b4393db4c69632bd34c092b
+EBUILD ski-1.3.2-r2.ebuild 1135 BLAKE2B 3922aa14df47b99a3d6593c3c4929962be33df3e80cd799f57a0d25d59b91a08e1882d99beae90153c26275993535846041fff054ee5b96ed11859e396417a5d SHA512 3c30c10723ebf96820e233f15349112682d65613119e1af89a70b31cfda0e951f9748d84dd29ae5ae68c9e88452e71cfc98971cbc772fd0c266345de4204d8e5
 MISC metadata.xml 335 BLAKE2B 079d4ba6e17a3d3351d2ca5021c67a7a87489358d5d0541e60e41105511b36f203713605fb76b84cdda6a799d63a51af0923ca4c58c7c482ca13626d3938136f SHA512 4b9ac18f2d0cbb672eb1af814e0f09a8bcd5b2f9f4cd1f1c30efff18ae2eccd2ea4f166cc3446756733e2bcc581b9a1f7ab62a96234fe9e02f649eac2a011b20
diff --git a/app-emulation/ski/ski-1.3.2-r2.ebuild b/app-emulation/ski/ski-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..389d021a5d24
--- /dev/null
+++ b/app-emulation/ski/ski-1.3.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="ia64 instruction set simulator"
+HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="motif"
+
+RDEPEND="dev-libs/libltdl:0=
+	sys-libs/ncurses:0=
+	virtual/libelf
+	motif? ( x11-libs/motif:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/gperf"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syscall-linux-includes.patch
+	"${FILESDIR}"/${P}-remove-hayes.patch
+	"${FILESDIR}"/${P}-no-local-ltdl.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
+	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-uselib.patch #592226
+	"${FILESDIR}"/${P}-ncurses-config.patch
+	"${FILESDIR}"/${P}-prototypes.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-ltdl \
+		--without-gtk \
+		$(use_with motif x11)
+}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 424e72c376e9..6c2ab0f1f01c 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -7,4 +7,4 @@ DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c8
 EBUILD vagrant-1.9.8.ebuild 2169 BLAKE2B 6a8fca05bcb8544be3202fad124d3528065ede3dc1748c636df8309f579917c22fcf29f6fdd8374523609962de86259a55a86edae3fc45b354baf50e73fa4a74 SHA512 ece9364b5437f22a2f441408c0811d14dd93138e7d9cce5ed785847b9e38982c880c808a1ba7668ca24fdeadfdd59a77a931461897eb54266aec4c834549f6b2
 EBUILD vagrant-2.0.0.ebuild 2162 BLAKE2B 089a4d828d04c1450df47093ab9eb528a4d2812f0706baf5217136514130e757c05b17f4e9558ef468a6d257ebcb6d379af64c8e827b71a67de63c06727e7392 SHA512 149763cc4f924a7879e0ad2da42f1d8dd74ff2679b44ad4fc3f16be588dab3794a7415decb089a73c15f4a86d44102d4fa58198c49106dc1e58dead8ba8bdea4
 EBUILD vagrant-2.0.1-r1.ebuild 2051 BLAKE2B b13ba8764cc2b29654cf05a7439abc56c24fbe4d4fee7938ace3cce2a2c3356952170f6a43af93b4315752fa27044b74c49f9239f1fa70a2818c8cf1db5d80a4 SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39
-MISC metadata.xml 572 BLAKE2B f01dc318ed353ca732a322260e0db9bde437b7d9f56a6fa293c7f1e8f600cc86075e740d1e5669be7e0d87068e1a1075a9c44ee7d39e7d3c00b42605e5461e22 SHA512 37ddaa8e7b99b2b9e1487254af11c2201db8469da1a63e26c64b4cb3499867bd3d15b6e2c8871a1550a92722e76c0509408b148e993592b733fd8d14299aeddc
+MISC metadata.xml 526 BLAKE2B a8d050fda7277001be0e472a1631c5d03620eae6d2adbd7fa985dfe478a137b444883587c37e2e8b1f6e6b55099573da1b4ec0a0d31863beb033eb17126d6d2f SHA512 a7b05fb9aa3c0e94bc5e3a32ed7da703dde28e254892e76575a6fe47ceef60c4134ee9f75dab48bcef72e98b1be32494d739e74e66f3aefab77fa4a5d55e346d
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index 8fedf524af40..43ec80380400 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 167763ae2f3d..0f5832924b70 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -5,6 +5,6 @@ DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d
 EBUILD virt-manager-1.4.0-r3.ebuild 2711 BLAKE2B 71da7d4392610379b0fe3fae4919cd381375c57e350ff3acf150be818b347d454beb87fa19532a8fdf01b9a31c43914ef9e0e0e64936667625ef634b2be5c487 SHA512 998cdcbfc46786b8b3dc07fbc820bf7252e1b1b1671b707c2db4ae96b4f613cc05581004d4386fa2fad0789cfc6b0b144fd55ada96040380530956a302047db2
 EBUILD virt-manager-1.4.1.ebuild 2427 BLAKE2B 4392a2102a51a5bf89ff53bbfca88bf20d0bd77ac6de3f9fa7576827d9ba714caca791e958ba2147e3c4eb48ba22d7c1fe8a2583853632b937794c1105e23f8d SHA512 356b82caf17405bf74d80809a83f685ca6941fe64cbc0ce6775c9dd79c75c578df9f3a1d11e96566e604a9fa8df2f4a883be81f9a9f3733f7da94412ec5a71c0
 EBUILD virt-manager-1.4.2.ebuild 2399 BLAKE2B ed2c3878c9b3ae043459a154a25a3161a09523909c296c632b32d08c5ae8466472654086c2177a7b6c1e212a316463734b4a399256e8636f641787cbbf981780 SHA512 73a108a870ac382b3a72b5ecd9119941137208f257b7606b91bdbdbeacccf107c8fc0b5cd562378828e247b4dc75470584e6b0c534688caabd511c9e142b4f6f
-EBUILD virt-manager-1.4.3.ebuild 2403 BLAKE2B 1e1ccb66badebeafd8c1a03762e6e0327aa3ec7b5f6512e7602c232974f78d3b687f9757194a3c4452a3aff7e6af40f870f11107ecd632a88a69b0d160d426f4 SHA512 83b87a8ee4a0655b4c4d3811f83a54bcebcf485348e4fbfcdb74e5a71a353b4419067127e09aac2eab5e944238612e1ba8c1e07c4d682548697e4a5a81750b89
+EBUILD virt-manager-1.4.3.ebuild 2406 BLAKE2B b18ed780d146def605866e8468edf5505cee6913169381fa591a804bd25ce6b6ec4b09801ee42827871f6b08d9bd8aaa621ba819bbec682f6731fbaa8e984411 SHA512 0db0e050d64b2b6cf820c4dfa2a21c1154ee7a3bc124b38b78bbd5e6ab18239a5cdff49838597daeb3a1fe71b2b4ee167c685f2217087404fe7d6bcf9fa82c44
 EBUILD virt-manager-9999.ebuild 2399 BLAKE2B ed2c3878c9b3ae043459a154a25a3161a09523909c296c632b32d08c5ae8466472654086c2177a7b6c1e212a316463734b4a399256e8636f641787cbbf981780 SHA512 73a108a870ac382b3a72b5ecd9119941137208f257b7606b91bdbdbeacccf107c8fc0b5cd562378828e247b4dc75470584e6b0c534688caabd511c9e142b4f6f
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-1.4.3.ebuild b/app-emulation/virt-manager/virt-manager-1.4.3.ebuild
index 9ab5b8a190a0..5d71ab10f3d0 100644
--- a/app-emulation/virt-manager/virt-manager-1.4.3.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.4.3.ebuild
@@ -14,11 +14,11 @@ HOMEPAGE="http://virt-manager.org"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 22cc465797b9..438d00de816d 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,4 +2,4 @@ DIST VBoxGuestAdditions_5.1.32.iso 59512832 BLAKE2B 73fcbb3d1db1056970a86e9c1c1e
 DIST VBoxGuestAdditions_5.2.6.iso 57866240 BLAKE2B a9028dc084eaf8e2a759112a2dfcc9f15486a1479fbb0c3ab77484e2775b8ed8df3759d265b73bea18cf20e02d82c022c8af1f23e9a640b89f69d2a6bd8c3e26 SHA512 23fe9512455d77b4cade7f731c9244439882ae54068158384e96c988ba7b4e2721ba2414189f6366f7c2d13f6e5355a0fa0bff501db6087705b8d1242e9d0f2a
 EBUILD virtualbox-additions-5.1.32.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
 EBUILD virtualbox-additions-5.2.6.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
-MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
+MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml
index 0fcee3f2dad9..7eb2e63ad114 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
-    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index e1fb52e23b62..28c02269bb38 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,4 +2,4 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.32-120294.tar.gz 19589163 BLAKE2B b
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.6-120293.tar.gz 19468503 BLAKE2B 5e1e490352fb06ceee868171583e50f8ca634a53799237cd1a3632566b6ca14d526e714156ccbeae48bf01aa4372a89d8926601cf5c1d8d34127d2d1e6a53edb SHA512 f81715b5e89ae21080d9a1b23cfd9be30bc35b32963c1b710262c1ee88bedc405dd9d2ff96761b8725716bd98625eea58fc076de6d42a4728078ebe303e195af
 EBUILD virtualbox-extpack-oracle-5.1.32.120294.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
 EBUILD virtualbox-extpack-oracle-5.2.6.120293.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
-MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
+MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index 0fcee3f2dad9..7eb2e63ad114 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
-    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 489f67570a01..1e90347d495a 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -10,4 +10,4 @@ DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 EBUILD virtualbox-guest-additions-5.1.32.ebuild 6050 BLAKE2B 7e7e412f7ef41931b1edbe289c9bf83686da85ab6e62ed0cc6b1654af764744d21b043a57d1637be882ab4eaf1ba514c779d937fa3e9b9c0eede5bc6b778be18 SHA512 109c99a1e80c09f0bc87587c769a9812b45735e3d17175d223976235765913b78eba4cb1ef51253134977807fea07d3efe0e2e06c16b52972480b8c425ae360c
 EBUILD virtualbox-guest-additions-5.2.6.ebuild 6154 BLAKE2B 95ce4ae40cdd8d81a79b65566a96ab9ad9ac4de057ae41296804d2f8c95d1ecb33179a25244462d8c68dcade2f92a26898d7822939cd133081a27af2b0edf657 SHA512 1582add77c42d27941444a43bd01e55783da0fbf771a710f759091603f475bc99fd57af484dd4d1aac64bf9cbf05f1eb8a5a07c6bb941f57a0c3107d91b42cd9
-MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
+MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 0fcee3f2dad9..7eb2e63ad114 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
-    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 4f6df2bcc0be..9b3e8c39d0f0 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,4 +6,4 @@ DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea23
 DIST vbox-kernel-module-src-5.2.6.tar.xz 635096 BLAKE2B 8c168b9e1d3de395ef663ca81edf63939cb7670f769995c20f9d4cb4f87194b22812707bfd62d52dd85e19de2562c27c182aad22f40928358cf07a0c5ac15d79 SHA512 c85f94e08357a11574af306b00e71c445b80ef6dea6c47d9cf1003c0d9f36d265ebadd2ae27b3dd96f41cc544e501d3eb0551559bebf25d35b9861a282f489bc
 EBUILD virtualbox-modules-5.1.32.ebuild 1739 BLAKE2B 075e707c8710c1c74e7bb279df95f26088f0a2ff47a4b4b3cec48d8f95c18ac078d4181f1feaf4d5a3e4bdd47c17e4b96854ab93705ff5febfee0f061d3e023b SHA512 9ddf65c8b8997dd7fd153e743aff01acd01d1f8c1778758be42eef94cc588c6dbf2f976884ed55414cbcae6644b6e875632e4f9fb4a06b51b91eff6a29ec97f5
 EBUILD virtualbox-modules-5.2.6.ebuild 1499 BLAKE2B 1ebe9aca2a473ff23c839c92091e572be6a8b1d140585cb717610b3403f539ba2b9bc6495298c337341271fe812b7792294e492350388c62aaa9ef21e5512d02 SHA512 5b5aaa85b3e7d6be210a299c79a79f012f733f6df2ecdb08d581ad9078fb7517d5165407146fc957ef4221ca0348db61780becb842d6fd108287d1387c5692cb
-MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
+MISC metadata.xml 438 BLAKE2B f6e24affc5a809324d1a844c69318a291111961503a7b0205b2338240b41a8a63d497cd8171994f3a72b4ca29ae4d9ce5c1145e2b16ea9c223fbb12b77f282f0 SHA512 85b1c97f5f2a0e765ae1571386bee4e2b21e3854e1f512701ce4e685cffacdd2442b1557c9af02d0317b292fc2a5471b3e2ec6e44018bdefc4b2282cc988d0c4
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 851d70de80c5..3603554891f5 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
-    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
   <use>
     <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 5316d0aeac06..0692c28c40f3 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,4 +13,4 @@ DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
 EBUILD virtualbox-5.1.32.ebuild 13882 BLAKE2B 5a18fb55794831de6c43c6687b4cc1ab9c8d924861e23dc9e8fb13bc5922812df0a3636794efde02ebd7dd1b778e0313aaee2f7951e3d19600311df90a3a5000 SHA512 8aed9a072dcbcb7af288870cc6b165ce012da6255b87695a97bce532d1791867cee366fe0b69746371d508b495f363aa842d1c42f092fd1503a8d9ed899be635
 EBUILD virtualbox-5.2.6.ebuild 13872 BLAKE2B 5f161288ac0f1bc38cc30981351ad89b076e824f76c936f252230baa9f105d57e437d5f51cdc1bcce629c0db7deed48125c0961b93ced54a1d6569bddcbf8044 SHA512 00bb0276f62dc829447bbf662ad2cbba9c50057e4fb2c03bc59c9771dff10f0c8c5de86508a10d87340e6cee762a04ee801246ca3ce7e4eca5a7807efc7a5fae
-MISC metadata.xml 950 BLAKE2B 98d5a25b631c928a86d8b716936c497aaba8f7bcbb0441c771acbf9998a89168bdfcb5d09e03d58e3403b3d90dd6acb611b1d47f4a0e4bf87a17c2f03ecc78ec SHA512 f09b74c1738a060749799ef652162824b40812de13558582cc660b57f1c379eb2d915ab53c1f2d55bb0c6cf4f917e0a6e55dabb5bde8b592a1eeaf34c3078363
+MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index d6912d557594..441bfbe90a09 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
-    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index b421d99c2e98..ae3accb2cc84 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -4,4 +4,4 @@ DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e
 EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
 EBUILD winetricks-20171222.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-99999999.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
-MISC metadata.xml 847 BLAKE2B 7c0cec1bc4d544c3ead723b2a3821e0634c7d6390c9b7c159832bf302b96a7a9110eac78940de88042d043cea50e93ee1f0cbb756c68992eeb635d46b0ae4c69 SHA512 54a9b20cf84169fdad35f89857cf5bd7d17906a53c760079f789653f89d5dece00fb8bfd8014d1603159cfd72fe0b9d93b1e28c0c788b522c642f224d7d22f10
+MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml
index 424fb745ffea..5e0912d7287a 100644
--- a/app-emulation/winetricks/metadata.xml
+++ b/app-emulation/winetricks/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>Chiitoo@gentoo.org</email>
 		<name>Jimi Huotari</name>
-		<description>Proxied maintainer; assign all bugs to him</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
-		<description>Proxy maintainer; CC on all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
index 0ca7b76e0041..da46917910c0 100644
--- a/app-emulation/xe-guest-utilities/Manifest
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -9,4 +9,4 @@ DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d
 EBUILD xe-guest-utilities-5.6.0_p595.ebuild 1489 BLAKE2B 3437400ad60f5724d33546cf5ff7560e7cea3737362bde09043d92d03adb47b0b007cc656dd2651cfadc1ce401f7347a8cc3714daf798dce8387b4e100d6d2de SHA512 82fec2ef7117e0c4184c69e3093f82c53c4a6247c5cf4c864c9cea5d7349139e0ac58d1b38ae38f35dce75c958a1ae166f776e6958835eaeda94b9c608944a36
 EBUILD xe-guest-utilities-6.1.0_p1033.ebuild 1497 BLAKE2B bfffba0b4abc718f8db1782d90d1589cf036e57601c9c271a28cd43d275a6f505d43c55b8f80a794187ac56c8804e303a830b337cc39a32737f42c944eb625e6 SHA512 d45672258065232c0bc0346e77b6dbb093885c21ff5680b5bdd67801f0b7bdfffddac3e1726fd8d6ca2246a6dffe5b96cf8580a3c54a357837454c266ae09543
 EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1502 BLAKE2B 3f1efed86e97639e01ff86bab5efddaf035284f6a058065072b1fc8c964573559abaa5012d0c12d3e8e6669028c212f763430ce32549456a01bf91b0d68524c3 SHA512 914f862eb826a3717c1827324772caf9d384b860ff1777421a357d37ccc44e785a09ce6eeb3dbf91937fb33d4b76b696313627077e6618596b75ad265a065fec
-MISC metadata.xml 888 BLAKE2B 1815bb060ccb0fe56856c94bb543007de2aaf6eefdfbd4daa1a270bb282680633ed938e16f9a0df5765e09be06daf4191fbf2d54014e3a92cf8b7622b74b77ce SHA512 f74910d0e2ee6b7bfe4e98c7c1c5b1266c749f8df86d900d2500c4722b9a73b752f1f086451f3746131415be9c1c34c8af65307b993b14d1e3cd216546861427
+MISC metadata.xml 843 BLAKE2B 472593a2f2cd850c1b65cf77ed0c81ccc8ed0ff0eed767ca4d28c6127559f7fb1cdb094cfd0a1b15c00b50b2ea3dbde88af3dc1d4eef8ed83463785f42ca4c24 SHA512 81830766353ca324bee53374fa0c4a61f9d177233fd0a69067a29cb6b6742290babac528b971ecec0e7efe6ec7d8a8fce1a5e01ef8be34be2f375206886521c9
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
index 733e714f2a52..b680abcf6169 100644
--- a/app-emulation/xe-guest-utilities/metadata.xml
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
 	<email>chicago@blkid.net</email>
 	<name>Chicago</name>
-	<description>proxy maintainer</description>
 </maintainer>
 <maintainer type="person">
 	<email>robbat2@gentoo.org</email>
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /app-emulation
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)