gentoo resync : 03.11.2017

18 files changed, 698 insertions, 33 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 0bffcf5c88b2..b67aa75a9c62 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,11 @@
 DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d
-DIST containerd-0.2.9.tar.gz 1228977 SHA256 2360fec91d40e4e93757f964f07c74e35b6bfe838252b1cc814a176e1cd1c604 SHA512 6f0de476668e6b86a0cd5e1ea0f6dac24e0e68fe2dd52b8915dbafa5ffab137a5eea866c216f8184ffa6e4750c7b69bce3d46552e8be283a15ce676ea4356fc8 WHIRLPOOL b9fdd57af3cf39e6a5efdd67f0302ad38d6634d20aa3eb45431d2900f5fbb7dc62d624b07a5028bbb09ae763e07103e37703cf52f3e14e7af72fc2198d9c7876
 DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e09e4734067f84ae85b6ef75ec31b488a91ae54 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9 WHIRLPOOL 880f19a994f623b7cd8c3f771b5c56468681de349ae4196e60ffcb5a34d42ef423d8eefc82c07134c9e50c33bc0ecbfc1a9e47c3df987050d8dcb82da0178d80
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0
+DIST containerd-1.0.0_beta2.tar.gz 3681494 SHA256 3130384a814bc0a43fe3b76e2bbb2db2372fdc96490b76f8b278362ebc0d3fb1 SHA512 cecb4d2e0dccbc27c1e59f3e49f8fd5b08445988e49aa4b8a2a5910851509d51e001b5295905288c29fee2d91eadf2180a6b86947e130abe1b33a9a01416a286 WHIRLPOOL 4d526904a146971d57adbde6102e4fe42e0d303b102e721e34aaea3f54ef3176586dedf31a347f52d95a6e5c1850454b31ab3e5c6195b868929d32fde6218eb3
 EBUILD containerd-0.2.5_p20170308.ebuild 971 SHA256 357c0c0c8399ca40b0222d95cd467b595a0877fdf694429329d8a9f299b6e5e9 SHA512 f519a8755010a178a1c96e266e86d4b2177d1d60498f68d51394bb4546fd33d4ac281480d0daf43a8adc0784e5057e8789f05aa77ed28e79197e7b2483671ab7 WHIRLPOOL 95af6f5c16e68ebebebad4d494d1bd9844d38a9073c0ecd522684c30fb6a06ad6b0417837cb6c053e9dbd137c56155e4955ab5e7575fe63dc92564bc93dc7016
-EBUILD containerd-0.2.9.ebuild 1001 SHA256 c07047e6f19d55893171c223d44ddad4f0b1649e23da7af67b1a0d6281cb7b4e SHA512 57492b30f3852cfc235212de64b6efba8e2785cbdeb0acdf6fac9cbac653532693e5472f765a5f41dca9e8af0e3ed1f847e18c2e48dc745e355d0df01b60a5ad WHIRLPOOL a024ef762464c97cd51553418006f55fe78dfcfce1956f59aeacb9432a4265095c581883b36baeb6962ab5a6ed56e11e8c2a2345388b3c88257ef4320e100617
-EBUILD containerd-0.2.9_p20170605.ebuild 1001 SHA256 76cc9d2eba27a3a48c6d7d96804496f122f6bb46228f281e07ad9cf617c89287 SHA512 8c562f29fe227fc9f9f26b5fcf17f553a48c65a2413fb971d5f4ec7945659a86f74ed59062832c0dd80cc81f7ccda901f568bd39743f64e3000946111348a38c WHIRLPOOL 60af398e7c692f14e1d8b0c7a14c11a53548ec88ee599fd8fa7199c042c2e1fdb92c9166f7fa8a606e28d34ab009ff9fea08582f55e6fbf823b7580b9dd64ef3
+EBUILD containerd-0.2.9_p20170605.ebuild 1000 SHA256 d8b66bb902a1e5ca6c58efc0c1b534832457bda08825f55ae6c177458761c9c8 SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04 WHIRLPOOL 744713fcdd4726983c9cd4c1959446d9631d523e62aa28ee47b5ca679609d59701bc0f7c122c58e65325fa24917e68752e882ee4d9a0998328e88b717920070f
 EBUILD containerd-0.2.9_p20170917.ebuild 1001 SHA256 e05ed2f3fabbd8d0466506292b0a75e607ca3de9d3e799681eee9754ad5e1313 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f WHIRLPOOL 0eff2136f756f39b09dd1205052d3e6f5efa6d9f6dd5fc2ce8eef8e8b539946cab211812b6682275a79bbbb31a32c63a203cdeb62381ad309c39336512170c97
-EBUILD containerd-9999.ebuild 929 SHA256 46f91c0f86a04a209d291f588ddd8e04e3106f35366e943caea68ad9d2d5eec6 SHA512 c6a3cf6625ed2b919f1486b285a2a15de6b7457cee2acc7278210accb5548aa98e0de7e7729b27f10789e2ae4862445322f920c46b2d29ae7bcd213960b92979 WHIRLPOOL d88d73cfc2b479a36051448dd19dbfb9af7fcb8c95640858593d2fc786bd8a669842f4303a9ed01210fd8deba5e75a73507b947a05e2db2a77a6313e4fe67a9a
+EBUILD containerd-1.0.0_beta2.ebuild 1228 SHA256 036490a9b30c448eb8912f7eb1e2630dc21b7751e31fdab757d7a9424eba7c36 SHA512 77a154a7a0d4f10e247e9f2b4a1f3c0b44f7cfad18c59f86afe25e77fccd3686a1e96d34603aae24889ad422037aa7cda8c80822f7168544bd2af0b6e828e9ed WHIRLPOOL 9a3162aec6cdac742c3aeabda449ad0934a1ff7dc8aa3a45fa8cbac252595081dd809c4712dacf389653ff47bf7eb3be27d918a6f48fad18c4ba320a437f480f
+EBUILD containerd-9999.ebuild 965 SHA256 b7e8d103eb3c8439cab6cbc0eeb7a0766a4611eb2f1dad0b68f7f299aa5fc912 SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 WHIRLPOOL 6ea886f31c397d58103e7f7892826dbabe71e3c3318d81cb71c79f17a035ac3e52a68a71a3ba42ccab251d3ca9442101eabdf776a21146d89eef985a2ac790f1
 MISC ChangeLog 3648 SHA256 23d267d9839cf9ddd25ec70935aa9cb0d751f1e1fec5fe04b0ab363ac5305df4 SHA512 6692f12dbd09bdfa0f7aef7a9d96e31679f2f8c0ea83c0ee265cf84557ad3cf644410c7372142206509925ac99e500adc9b73390d7868c1a014e76a2fdfc8b9d WHIRLPOOL 7cced3a814774acce4c1afe07e5522845f70f084aeb9975dba4351e357b653b1559267e17b4561029a39c014e149ecbad2501e0ed094ad361414794df9dc7d94
 MISC metadata.xml 909 SHA256 649d7ed77a830933c54e829d88186959f369abb5575e6b5c51f76496da04e95e SHA512 bc18fe0db42a7d9eccc8757f18a92ab3c46f1941f0cc28e0ed4c7be2569b7cec64e1ef49bbddbaab2afea5925f67bb4f6a06f4d1015e29e73c9742f475731d03 WHIRLPOOL 52e6bdcbefc6b473da57e3920fc67d0d593e0028e87f9d4497bc095416ff630671634ef089d62f153e9cfd25c1efb702968fa3d4ef04e4c7f21bf776b2c40c00
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
index 70e979be3fa9..e574004b67ee 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-0.2.9.ebuild b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
index 3849a49ca7a0..a9b3d5c5ae5a 100644
--- a/app-emulation/containerd/containerd-0.2.9.ebuild
+++ b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="cfb82a876ecc11b5ca0977d1733adbe58599088a"
+	MY_PV="${PV/_beta/-beta.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="a543c93"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
@@ -23,20 +24,28 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened +seccomp"
 
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170607
+DEPEND="sys-fs/btrfs-progs"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
-RESTRICT="test"
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			Makefile || die
+	fi
+}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
+	local options=( $(usex seccomp "seccomp" "") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
 }
 
 src_install() {
-	dobin bin/containerd* bin/ctr
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
index 42467124d22e..345b3fa9b966 100644
--- a/app-emulation/containerd/containerd-9999.ebuild
+++ b/app-emulation/containerd/containerd-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/docker/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
+	MY_PV="${PV/_beta/-beta.}"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
@@ -24,17 +24,17 @@ SLOT="0"
 IUSE="hardened +seccomp"
 
 DEPEND=""
-RDEPEND=">=app-emulation/runc-1.0.0_rc2
+RDEPEND=">=app-emulation/runc-1.0.0_rc4
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp") )
+	local options=( $(usex seccomp "seccomp" "") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
 }
 
 src_install() {
-	dobin bin/containerd* bin/ctr
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index bdb90bbd549d..5aa79068090f 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -2,6 +2,6 @@ DIST docker-runc-1.0.0_rc2_p20170308.tar.gz 561400 SHA256 bdd0fc0b5db42bb1fc439d
 DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 SHA256 d09b31b9a5adf0a3295d10b20e5f65ec8e1c52a371d463218694c37e075829e9 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf WHIRLPOOL bec7b506a6b2522d401733b32a9f500aec69920dc6d8072ab434c7bfbb1c88a6fb00afa1d2728f78fbaac1d58f890a2b5932fdbe2b0e87b749293f2b48ed2e8a
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 SHA256 d5820f1c655061be79441bd57efea4e5b60b25b6a451214b64172395b9fda383 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d WHIRLPOOL ed34894a3878c0cae50888c936eba1dad8d58da8d7042d5e421f06e4e98c1d7701a5c877baaba14a46d588b2ee3354e19d72bb141d5d8e7f6c0bed2d3a6b71b6
 EBUILD docker-runc-1.0.0_rc2_p20170308.ebuild 1369 SHA256 30437a9a1b5c4a0887ed57f81193fc10aa5859dbfebe5494019e0b3f3f61721f SHA512 7ca6bdaa6b7935c1b1b094fcdb94be734f9d5f1cd5f4e53afa9e8acde8fbc417e7a8d2d7957e50d26b32c613457b6d45907225e51db37ce22efc6746cb2e0cc3 WHIRLPOOL f6ee74ece4cf5514685b69fba0d5710815546647e2120249b7f0630dc2e119fff1f0d3a0af27c6e68b46b4a3d7247a42a1766015bb5325dd6942d68e940462a3
-EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1384 SHA256 4a6afd296bd338a00e3af96907c85f17b3c6d03a32882c80bb0dc75ae099cb2d SHA512 0706dd11a2ae64ab7a56badff4e6e4220a7ac4613e87514e2e633c5f5a875e0da8fde7135f2956bfdf2f14fc6266709e1dd478d31cedbd328be0c9406c604830 WHIRLPOOL 85916ab8e340407d9fa525c90bb8e045984a5499c4c4ab587617d6008a65c6c029eb646a5892a106ebab7414641412162f218ab2861682643067ebe4c92f128b
+EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 SHA256 c70b72fae7ba1ef8f9f7b0fec7f573b20289e1a1fb4f62aaf78f7092e1bb3ede SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c WHIRLPOOL d2736eddc18e69bc6160a380d8f389166862dd2d6a7720d8348f243f87ed8a9988ae7f60e86116a36011a579f14003988934fb45a552813da6975743d3750ad8
 EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 SHA256 cf3dd55eba4360b1a49fe5bd460366741490dbb118c17a7599dfef1b32350b7b SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133 WHIRLPOOL da0bec13658a2d919fbea058c0619314a335abf146845ba5bde0dd8d76aaf33ff359c2b2c4879361252598b194305a109a46cfdfb681cb94b67d4b0ca65e70f6
 MISC metadata.xml 627 SHA256 36fac17c0d0f354ffc9dcf5d8154f3a6c70b7b92cc2161c8b2f13e0e589e2167 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163 WHIRLPOOL 5c90aaef62b5c3905f1f82a5923dd0b965e5f7335665f5d583a3d3992504b0a1c611fdd12e54f6a0278193b277378b8c2fda18d91d01c895dc5abece21fb70fd
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
index 03e8e10d6e78..930d6d1ff44e 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
@@ -11,7 +11,7 @@ else
 	EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
 	RUNC_COMMIT="810190" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index bbd23dc36c00..d7d675cf7c40 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -4,7 +4,7 @@ DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585be
 DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b
 DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae
 EBUILD docker-17.03.2.ebuild 8320 SHA256 7a83f7993f61edb28427d1864db270483682e21f1ee3498d12c98a316eb0ca6a SHA512 f6f1115d0ef9a55e92fdd927731cd4011a0c69fa38f3a57e96c54d481a86e99c4fe856a2c2931d1fb87077b6a69ebc751157efd6e9402518e6e8862a4534b302 WHIRLPOOL 38e30777580017ddf31af256ab612f2236dbd9c839f6c4e1e2be054fd2c4f39e3f222cec838f1d38fe6f3af0998f52cc3a4dfacbf14122e3585688a7aeb1f48c
-EBUILD docker-17.06.2.ebuild 8712 SHA256 b622233449ca47beb40144057c8b426fbce76ff17ed8c45c8f88ac45c04e0c22 SHA512 1ddfadbbda4edcab0406005debc9ecd2743babfdadf45ade9d88d18197dd5be4ca2b4313f440adec5140e7032103df7cccd2da9cdb63374d938c56792cc7d477 WHIRLPOOL ab9ccf6ba69a79ff7d00b9d9947d93a8e8a380b6efa65049fdb5403d8645229b01926b3db0a6203da68c2fcf01a950da44550e8496f87b3d590154f9d2e10d7d
+EBUILD docker-17.06.2.ebuild 8711 SHA256 b7bc73cd441558c353e31e5ab5025d41a8b3d2537de1254e0c898a788e23d72f SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4 WHIRLPOOL e460ce19a3fe9299011f611ec60b9cb22db2b1089426997b99fd7bf6a260a5f4dbcd4f39c754aba2b7eed17903e633440d287e7011de9e94d3560008d3c89e5b
 EBUILD docker-17.09.0.ebuild 8767 SHA256 5e1ee06656f94a6b7ebee013c2ca7404535ef1eace7f727ed99102dcd19ce699 SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f WHIRLPOOL 93f75fd8c11a0700b32aedc3abf90fcdae4c894ae5e0c3077c2bfd838f3cce47508a2277ad0f560ed48828c105b1ea703b18e012429775498402660e7d578863
 EBUILD docker-17.10.0.ebuild 8766 SHA256 1f12a633572fbd9dec5bb9c875fc5b872de6229494c27910fc94f2c912f7199f SHA512 b6ed073a46053c9b0dad42888062890aee6186871f72802e56a131bf1a1b123b0f778307c647c24ddd2be3710b357c56279e7fd2e5894c165b8fd940b8b75ac4 WHIRLPOOL e8a7f8aaaf7804e0669353d94f7d4241876a2bd926156cf586deaad1db8f7f21a831a87f9a345c27cf081ca1254cc953556a6adfa363fe2c3473e6fe305b2b8e
 EBUILD docker-9999.ebuild 8077 SHA256 a88fd76547a4100ea43224e72e3d4507d3211a3de6f07b60e3f79ebd87919a75 SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4 WHIRLPOOL 9e93646899e5e43064f67b37768d526001d070c048555125991c5eb03f55fa9caf043cf13c045ab97eef45e8f737159a4d18f072798725dbc6d13d33dd5e8fd8
diff --git a/app-emulation/docker/docker-17.06.2.ebuild b/app-emulation/docker/docker-17.06.2.ebuild
index 29b50ed130f2..8d869dab470f 100644
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ b/app-emulation/docker/docker-17.06.2.ebuild
@@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="cec0b72"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index ffc34362144b..b557b930dc3a 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -5,7 +5,7 @@ AUX free42-2.0.6-fix-makefile.patch 1742 SHA256 6736d62ecfd328a1c00771f550bcd1ec
 DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769
 DIST free42-nologo-2.0.6.tgz 7348647 SHA256 862135da3066576d71dbfedc1e41e97230e656ef2f0db3a5b87ba96650c12b9a SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d WHIRLPOOL 5740055edfbafc6f91ba9d3a8b1dc259511dc99b1e5d06a78cf03976b71928c5423d57cd023c9d878108394f3b0992a3bf532f06e69089b976a8ca789dcae9ed
 EBUILD free42-1.5.15.ebuild 985 SHA256 2c7bdde9a7719969d4beeefc37991ccd9ab11ed528cd8800e892b3f62cce67ae SHA512 58c18f521601fbe863cc90dec6954a41e26d7f3aa1d0b12c549e84675f17be153f10014b223d46275a0438c240a356caccca41bd7dc85457d7ea2448624cf201 WHIRLPOOL 10d92d850276e84353ce3a946ba2badaef5cbe3faa9dc39ad45bfb1a8cac833033ad910f008eef2e748b81726004f981c7ee15864f187c55d98c162e49169b22
-EBUILD free42-2.0.6.ebuild 1045 SHA256 b6c84d49241d89b49b873f7fa59e5b02cb9e7a36ad6408bc3c3a4b495462e7f1 SHA512 ab27426244237727b0a8aa4fe3189978d5e096290c5df9f5f9a32d30c0102b09adc83116b02fb5988abec7a11794c679c7fc3220dea28b3594cf2217d79b2f79 WHIRLPOOL cc94b2db377515e61b649cb98cba4cf31d6781ac64b65ff09652dfdf10de7f7f3b3740c6f9538f4582ada3a32ebb4947eb2553fbd0ebb72b684c260717f51630
+EBUILD free42-2.0.6.ebuild 1044 SHA256 e6a36c327a13bc79fc73900917f32b49e8ce7b821d8ba1bbf6d88ecafb51366c SHA512 0cb13769bb6dacd1bdfc4e675d57579b440d575ef679fdbf6fbf575832014b2bc5d0d31501c299e0ffc049299c72d64ccc146936d5d5158a37c6e61c23caa920 WHIRLPOOL 936737111d4cd3e29b37e9f68090e004cc12d79539bf05aed1dc91aa700be3f94ac93d95fc588a1e89cf7d9551fd068b3fb3170e567880fcaa838c5c9f7f8eed
 MISC ChangeLog 4309 SHA256 ff56171f5a0b3d9cebe3608d4ba414d3ed6f64c7d780c3833fc9214f2d59b2e5 SHA512 271749df206b6e5523c1af2ed2d27d2dcb24c4db48c3eeb20ccb8d4619793b31abc1b85d9259a8444224db12e22f54b70eb5c2f4a84c964aea60161f0b4e554f WHIRLPOOL 0e0be69e14aae1d3f117f2bd100dc57c3948f03fa475fb214b772e0da705219c4bbb55755674d443ae44b45280f400a90fdb96a36cb637219bc9b8e2d07268ef
 MISC ChangeLog-2015 4257 SHA256 d76539bb1c895cfd7cd2dc8db0227070ae9b095c19370e59bfff7077b9601672 SHA512 8786752ccb9203b31f629cb48d17eb854aa0c6d1f55d286eeab31a6757c7c81d340b88ee34021f4269e093ea15c1d5fd464955f14f1df981f08f3a4d57031d0b WHIRLPOOL 45a1d888198cff6778e93f99dd330289ac0926b016f51608d15f124aee024b8ac691895a2e10a155dffd5194792392fd2ae5325ca686a0bd0db6ae86fec34486
 MISC metadata.xml 554 SHA256 678bba466793d567beef67661d467532c6c15bbfea57d1fe222a32da7f6c9c67 SHA512 f1035a6c26c5168022e623c83784da4585fa16edd71889bc5b608494eedcb0f34c4a6f478648784f1a30fb64bfdf48b95e31d01213fbe29754b7208ed43e1579 WHIRLPOOL cf8ae24b3e284e8b3c99150d573190bf51cba61dd0361c38021170d99cf619f496ce4149db9108713374db0d8009ebecd7f4da81ab173b47a0cfa217859667fb
diff --git a/app-emulation/free42/free42-2.0.6.ebuild b/app-emulation/free42/free42-2.0.6.ebuild
index f40b9a599bd0..deb8bf3bcab7 100644
--- a/app-emulation/free42/free42-2.0.6.ebuild
+++ b/app-emulation/free42/free42-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 6958e56580fc..5d30f1408e56 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -13,7 +13,7 @@ DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7c
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
 EBUILD xen-pvgrub-4.7.2.ebuild 4855 SHA256 05ecb38bd3cf2d7d2ee916bde949f7cc5e51e3c112786dab71864f55d0255644 SHA512 86198959919f66903003d83a0b9a9951b85c25bae2507a2cf98701adf7f2d61149bf2653687f9f8f24384b9119269c35b67ac4e7eb727f18e96fa1f892233947 WHIRLPOOL 15969302211b83c417a9481f31636c6555777f761ed082dbe5f510f8b86f5986122359481879b8d660f256bbb3629699c987309a82b8a1a8966913076b4ae030
 EBUILD xen-pvgrub-4.7.3.ebuild 4858 SHA256 b1a306442f38efe10e1699b44c7b0ef6da6765027e3b14505655bce7de77dfd0 SHA512 98342e4eb779dc0c8bd204baf73c177242d5678eec14871c252581456f0afd395e8758ea9f697b15bc242dc14a9c8217bba315ba71f891c238cb051c132fedd1 WHIRLPOOL e0f909b7701460529463cbc411e32f27e0437d1f1883c0b25bb84a8aafa8439875684057f4418a9a71aff5cffb8c6f63b7de4e5c2573137045ced23c4d4a9b5c
-EBUILD xen-pvgrub-4.8.2-r1.ebuild 4868 SHA256 fa393804ef71b058ac21c60f37ffca18aad6d29dfd81f51c1b64ba872c07f311 SHA512 d301a42271af0af034f7d97b358f3931401331493198fdee0e40b36ed260a9d32fc5cab4b546a544fcd6d4218cdcee1cbb8b7a0b7bea3c8a62dd9979c4593fd1 WHIRLPOOL cc71a62b5d777640592877048c9b4527dd44d176cbea4e0629f8bc648c51cef7b699ad4c994ef2f15fa4b65c6853abbf54c94408fd4597270a3248a8601617a0
+EBUILD xen-pvgrub-4.8.2-r1.ebuild 4867 SHA256 c1e2814c844c251ff8dca36275734810e111bf4e6fd6c935494389272470f16f SHA512 1d675f142afc4b52f4b216091d6109ac906548dedd04f67b312bff1823a5c2b1ca5adc06fe4ac80caeffcc58a3f7501be3bd83219c242e118b660e3e164ba4ba WHIRLPOOL 028e15584f5d7156ff99c0de989234768c415df223052039f168dd34987d38295485235a069c7b5fbe163f102e73760ae10e7728227ee5abb3292b7193f4e4ed
 EBUILD xen-pvgrub-4.8.2.ebuild 4860 SHA256 1d3dae13bc0280ec2627db29f9e875d2e61228fb4cd52899ac123462e4d5e431 SHA512 54ec10e72eb29850b48216e9d81c38cfe82510aac751be69bdcae124f05f07021562757f85e18f091a65b1dcf1f257ba4652d994d415d05ec4485845beedecc4 WHIRLPOOL 2a9ba421dc9e35d0fecd978d597c0b84d83f05671e0c2422985b0be2606f5fde3a818cc6c9d67eb7b429f2f11f3430b31710d06638c082454e4ebfdbc16c10aa
 MISC ChangeLog 7852 SHA256 ad4918f5c2385e0cdce11a5a4dd3025138389a2cdb2242b111d4d2318bd62975 SHA512 182aac066289033e565c50fe3ed620a6d123ffb9570e55fcfe1834f59f172a758a9238e160b7a9525512f94887617ff89165df1519d752fe26df84ef0016405b WHIRLPOOL c77c268d908fd4dd26888841e295eabc2040598a7651e36e712ae9a94149ebdd28b778895a76eb804276f791da832360c02559fd70c2973a8f88fce62d2cfa6c
 MISC ChangeLog-2015 15121 SHA256 729879428f3b9ee1f4d94eea1e3e3eaab4875658088799cfefe49eae3755fdcf SHA512 55627fe8e88dd3af475d65c33f28766ce475919add045bbf82a950729b4eec4df2ca02534cd39eba07dafb77b02c82d773d6540c05fa144ce96bc624c7bb915b WHIRLPOOL e66c52cf6783b0d77865b20074a3e2d4b8da4f3c37340e3f8ef96fbd9fbaf04ef2f8adcc0e21fa164bb2da1bab7ae5d664544080fa968f3d83e1d1461c3f27dc
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
index 4f3af9d41003..863eff7c2b44 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
@@ -32,7 +32,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="custom-cflags"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f99791ec0059..00177e10f0b7 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -22,6 +22,7 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
 DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
 DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
 DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
 DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
 DIST xen-gentoo-patches-10.tar.xz 27876 SHA256 aa91759d25611afa2e851e190c8445b18e4262037fc06da886f2fa4a4c500b94 SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece WHIRLPOOL e02cc3c6ffd701b2f04df111ab33b18f7fa09e292b94a34af4d806509a564b896a7b677ab64654523ee992f363d59bf6bd4c2cbeaea7330f368cf657bfa2d538
 DIST xen-gentoo-patches-9.tar.xz 27456 SHA256 67c410d12ef4628a8c0a931e5868b425f2eb4b2f0e307304a75384cbe509734b SHA512 9a797be9dd2392c34b3f6561c2274e116b4f5b114f4520dbbd0b51818c774479ceabb45aa916f93c1a2bc49787f4ca6e6c83bc743baa6bdeef91d77276b20f36 WHIRLPOOL c41cde532726bb55acd05d558b35d575b229d2ee64eba7438f7b196df313f0e44154148c1e47bf6e8c810667b3b237bcfa410371b4bb6f097b981f6b2637ead3
@@ -29,8 +30,9 @@ DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd76
 DIST xen-security-patches-25.tar.xz 9208 SHA256 ceaa520d4d98ab7b6ce5b58c380499372cb513dda0c8236106cdf878385d4458 SHA512 18539c1f42bc95a06f7b06855614fafb4ed7c07a145d9ab90e02954ba405d21fc4c379908e3233ddfb85ccaa04515b261ac4bbf3987ce00e4479158f03edd917 WHIRLPOOL 4cff34c29a5c38e6a5bd0d4f4fe89d8daf944740934b05cd61f4b8a345ddb4d8a8b2de6db27a723154169e3f28d5b34a43eddd08c909cfa3d6d5aee26fcae693
 EBUILD xen-tools-4.7.2.ebuild 14072 SHA256 61ab7974b863a2791aaa188c5f5df408f115c21c7a1f770654a807ca45d33365 SHA512 2a8119fa5eaa93594379d51d039e0af86c11d4082cc9f723fb87beb4c7f04d6bf1b09da858ec5919e29e6d322771994589080f68dfd61f32dfa699bf852db0d4 WHIRLPOOL 8d22df2a0c065d0b959a1cb4f5d3242ac51a28f9c4d86e07b3b27a52d06c79b7c0efa0f2c32a8ac5e9d701a009b12a1a0a5d53c3f987e14819a79f004333a621
 EBUILD xen-tools-4.7.3.ebuild 14050 SHA256 bc76a043677701c09d900c4661a6c0a280c542ee12511230f3e242a682208967 SHA512 9e7f809973bd7bd37a8761d22fed9704e94b1a9a41c346799d81066a64b0ee9ba02cb0e5687fccb7618088f548fe58644bee7f81b1a6d44e43c5755ae49bf154 WHIRLPOOL 10939d779ead31d040cdaf3d3d5894628405c2a6ef47e056ac5c5a19b3741cb35201a42da5c504fee45acf681bf040f30bd6e9599eb09101bf196bdd6d4f5daa
-EBUILD xen-tools-4.8.2-r1.ebuild 14101 SHA256 5ec0ac7e080f65b1a251741450f6ab822e96fa58f23b60059fca638f4ed0b097 SHA512 f0ee35035973c31fb8ad151acf1dbd087817eb20a1391a3284d086f2b2aa1ca0b5d4c645aebf659f398a796311d4b7fea126b2b3c7881c64952b6ff165b50134 WHIRLPOOL 747cc55bde6436ce03b4ebf8a02e7902835dcc973291b580dd8e44b98f60ce6cd5c32a48aac23fb5891435b9bda9a7d46ffd1e6dd0dc8c2487f30a979b0df4f5
-EBUILD xen-tools-4.8.2-r2.ebuild 14129 SHA256 55436a876264fde1ea13af717dda2a7ee1ad60516659eeb0f508ce39130f32b3 SHA512 d8462922f0707c7059fe7b7b9910b087e3ea06f276203a3512970ad65e2b76a6bfac8d822463416ac49a29a52b43376eafcb9466ad11b22268be9f60162b2d37 WHIRLPOOL 6a91e9d3d5178af5b96491e46c357a7e63488e9268aed5fcc66089438143737d735b48d107ec762c985ce56e707696c49a4fb4241a542efc7bb5168ae7c5fcf5
+EBUILD xen-tools-4.8.2-r1.ebuild 14103 SHA256 e4d47b3fe72e202674954d7a45640b1ad63d1dfd1121444f1285aaf1b5e4e8df SHA512 61a2b8c34d5f6f54887e893007843719b40178dfb85b47c42ab53e588cb2abf13dc0f34d1785b60dd9fa2f673e899783fedd07d9e6089e95a9e948bb693770e3 WHIRLPOOL ba0fadaf8842ff6a31e1847cd9109407338e6a8f389431478d74ccd1992e13267d0df7a69f7fb549791a374750dc9f7df5ff7a096fc24df5e3ab8b4bf514ea9a
+EBUILD xen-tools-4.8.2-r2.ebuild 14156 SHA256 750f3847df14d1d1c6fa23166e2da0bcfc7996be822f78b7df933d0c0bb66b63 SHA512 c10bcfee7bbd61ba5e27c5e183afd952b0f3e773fafec2fcc8705a106aecee17e4e44aac97c4a74bd41e7b9eaa670174b6eb568f09117716db0e4613fddf74f7 WHIRLPOOL 5b3c0016a70a412d5c5e91647db4c8d2de843c5abc1c1285b20668099b5d74a1750938f1c003aa85dd7bed23f59d3f0a5a9e333ba486ac76fc699887ee4ade2e
+EBUILD xen-tools-4.8.2-r3.ebuild 14156 SHA256 dad3618f9bda10450f57cfbb1c9448a3550a90d8d33acfc3a75748948946dfe5 SHA512 af7bdee9f7185b5eb4a4444ae7951723a72e24d324d9d363f2ad0df4d5c67c6bb7eb370c3d1c41501a05b3332fa38f1a4089244ea44ef1108441575e61bab1b2 WHIRLPOOL 0cd7f4165f4067417e8f1b354c457fd11abed716f92f6aece812d2524d7e5eed7c75835dae03a16977d1b4cb513568396b0b9de54841a38a3d512673b0ab6d98
 EBUILD xen-tools-4.8.2.ebuild 13727 SHA256 0d4650499b9177eeb87a5b023a51dd497167c10ef6a3de74365256d597365e03 SHA512 b01cdfe60007b8310d34f1c9be7ea268831f4b333219b2c0fbbd7ea501bdf6ca5ba84cae202e8a25aa1da9137f889d08bf49e3820ea9f923e3c5035e8ecb97aa WHIRLPOOL 36dfcacd7eb9876e64961de292f638c142a1678fa9d0d2d580f7f51eef33a612cbf1ad3f92b56f2dc563b21d4b0d044a325b2364bd4dc286de4a615f5e90c49d
 MISC ChangeLog 22964 SHA256 15c6bdb3723570f38291c42047455516934b7d0e29969a0b7ac0176309d09509 SHA512 29a5c27e3fc0dba37b6b54a7834e39e34d3056d999b0a0ac0278607d7ac7adf7a924b054b941390c06643fabf873d559d627c0a026f1c6352c0732289ebf6707 WHIRLPOOL 2ecd5711ccdb9823c04cc4ed68392f8d1743c7070f34dbfe9bb0c264651bdf51d65210b4879e303ac550caf1fbd9ec6c2913feaaf5cfb96dd14b40e04af02a05
 MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
index 3e35cd4c8eac..6e96925cfed9 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
@@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="x86"
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
index 3de1759592f9..d7c419329aaa 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	app-misc/pax-utils
 	doc? (
+		app-text/ghostscript-gpl
 		app-text/pandoc
 		dev-python/markdown[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
new file mode 100644
index 000000000000..431efbabe512
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
@@ -0,0 +1,467 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=10
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix building with gcc 7, Bug #634338
+	# https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=f49fa658b53580cf2ad354d2bf1796766cc11222
+	sed -e 's/name\[60\]/name\[100\]/g' \
+		-i tools/misc/xenlockprof.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 6fe25cfff6ba..279cfcccb4cd 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,11 +4,13 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
 DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
 DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
 DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
 DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
 DIST xen-security-patches-26.tar.xz 8276 SHA256 2a21ec429f8952875f7d95f24697600e606326f1a16d5622cee73628cd0401c1 SHA512 f54fc7e720a70258263d29cc482b8269386818ad75792de87b0d0357fdb6af81f2102e5983100db47563435fa28f875a84e8c6d73d44797aadaf0c469d9fb0ec WHIRLPOOL b31667d8415dc1fbcd60160fdbc2fe0ad4de9bd2171fda875f5585b8d7821c4c035b029dbf382abacf4b6be745aeeb708f419fdcabdd86f78ff1c13703802e3f
 EBUILD xen-4.7.2-r1.ebuild 5385 SHA256 4378b88ad0cbc515f40c2cf1151281a77678799c96d932e25b75682510c93e99 SHA512 8eb417f766c4c07c80ec3ff53734f3c24d703ef3ce99dad0052dbd5b63232cf66e22470b9779e45ee6662e4057c78d13a3b01d9d7e5e7d8203bf78452cc08f3b WHIRLPOOL 90fd34819474f35141be31efc48f11a7838058cfe9b323ab46d0164bf7b5bca4ecd51694e7b2765a6e72b62b3dad8d4620252996263959ea4ba203ac74e1ae1e
 EBUILD xen-4.7.3.ebuild 5386 SHA256 74a72af9515f3ead828cc0906f754572a0a2b3fd5afefad45cdec4ac0508e744 SHA512 4f9b09496d2c6aafe5e5a6a50b8e3cc926856398ae46149e05a451f8ee2f615640fa3d2fb444d3a95ff3b00210f3249cd8828ec168b61e2466656ae5e7eb5a58 WHIRLPOOL f7d88913e532714664fa1f9eea03855b3bffcf5926bc0ba9401fa401c78fc2a9a056428886300a5d0549cad30c0cc35028bb386e92dfcf593af4ffc02d3610c8
 EBUILD xen-4.8.2-r1.ebuild 4934 SHA256 e38e9660e801b5f1cb3b88080b0e804c563fdddd22b85677bb2d3249e031ef87 SHA512 2911276e186ae07c1e8322fb7e3638d3f1c6fe58d5214f23febe87e0231f685567312a5595e9da18bc852da02dd7457ca4cba4e7f568207ad6f47c4a042494e1 WHIRLPOOL 08142c3b1897231e8d355a8b0322194feb0c7218bd6388ad2db82ac69327be0aa8e39a60b25d40081b3e5320b676d4077b1b1028feec01069f7a05ee79157d07
+EBUILD xen-4.8.2-r2.ebuild 4934 SHA256 7335043936cfd6e5b18e82c3ffadcde298e8473bc5296239ffa207d45e2fa0c1 SHA512 360c886e6ee22373e29d0b3c8776d04689cacdd4280226ba6da728642c25ee543f11e91e061f1303ba1cc5979155ff7b624b4219a7795cad45cc51f399258c49 WHIRLPOOL 5dde9f078d3ef7749150ce9df1c5ef307975c5d1cc43e9872d0ab243baa146c2e4149a5df26b9c247c3e4fbbc98c118d8597b1decd67cac17a859d156c47ad1e
 EBUILD xen-4.8.2.ebuild 5379 SHA256 78930fde5e11e655cf854cc23739e074b350e0b931716309e6c5aa48394db511 SHA512 79edc5c83b563b69851112afa2971f21ad2971fe62f4e7a5feafe3cb31abc866e8cb4156cf83ceb17a6f033fc5c23789be47f2cc5ebe7ce1a76d6db3e60dad01 WHIRLPOOL b0c85962342bef988cdeb945250d1f847c08c9b68c1a1fcb882eb0846e73b6ea2356fedad265aef5d6abc7776aaa0530dff4b02b179805fcc4ff05a749d46f38
 MISC ChangeLog 19246 SHA256 ae107ab371c71d67ccbbb373a29add15e6203ecd6e42fbbce8d37ece1b186fc9 SHA512 b51269964858e15797062599b5b0329686c202da6aeeefeb3f72bec596f35080221ce7591db7a662d973eb1e17d80af8de953a27e1df70e365b9538e1d311bef WHIRLPOOL 72136dd18b3e3341e0fdad7abe3d75f633588c800c647a7a165c5a11741d6c98e492d22eaae4da40ce1d105c96db4ee9071ed0955ef2c376bb0d2e4415581339
 MISC ChangeLog-2015 39538 SHA256 43b9fcb224880329df3962d7a0a5f67469d8a29677e9dcbc002e5e5d45b488df SHA512 0a23ab62077924f2daad976e7cb9a3f16de0c7b5eee9be874e4606168b495fe6d9a06245c7c6a375e93b411776f09b4c176de8f7f05ab9eef578b677f179e27d WHIRLPOOL 48ba9ac7cf44b1522d3846df5b917bfbe36839b60d9bee3b151aaad7ade953af73c2bb852c7b7181be8eff26a34ceddad5d97c323b9bd014ecb160daf53c5261
diff --git a/app-emulation/xen/xen-4.8.2-r2.ebuild b/app-emulation/xen/xen-4.8.2-r2.ebuild
new file mode 100644
index 000000000000..9ddd4bb969ca
--- /dev/null
+++ b/app-emulation/xen/xen-4.8.2-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}