gentoo resync : 21.09.2018

21 files changed, 419 insertions, 31 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5b47b90f324b..840dfbb3d7f4 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 09f2e7279c59..fa93b22b5622 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -3,8 +3,10 @@ AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef
 AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
 DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
 DIST reg-0.15.5.tar.gz 4053475 BLAKE2B 60541d7f02f3ee658fa185206f76df1045975101f0a25a636493a454984a8a2c836b1b74f7b8b6768c66ce0e12b12708b3f42d233e15ba64f0251b02a841bb76 SHA512 c1293868ea30dcdfc5251f95a5f287f8043be3a2372fdd08c0836919f6722c5931eb429f9047769b442bf3fdbb50c476e8509c62cb20b4b45d30793571cce44e
+DIST reg-0.15.6.tar.gz 4071110 BLAKE2B 376313ab4aef0f8bce21ddbed8f179aec14755990f6d99e5733c1550c58998f279e3c0beee7b2e11f25167bf7fb717dd731b69571adc410ad7475afcc98baef5 SHA512 1a5635af82f7a7951af325ffbc0d84c2e35ec0ecc040873ff7f0c7037fd2677cea235348c4fb0bf9397f1fd2ccee86e96ca080a1fbc28e60eb985e55e4a8a085
 EBUILD reg-0.15.4-r1.ebuild 1060 BLAKE2B 769a395dd1cfa2cbcdd691dc66a2e94f8b9efbbf24347dd9ebf56da7a6a705d6e057efaac9a227d9e22e52b679dda38ef3bbebab31c8f33b0989d5cd43f13e8b SHA512 8fc065165a355d2a8cdccd05b94fd49bf0513878f668a0123379adabe5b37a2b5e337bccd9906667ebce2f116837c1eca6923acbc57e017d9bb588e5ab40807d
 EBUILD reg-0.15.4-r2.ebuild 1179 BLAKE2B afce38e0d6c9bc23af77eb7b995f0514b9b8d02d08c5f7c6a139b7643bcb3aad420d61a62deadb318e9ed0dca0d00e71407f4af914a435fbf75db1c6b0cf22d9 SHA512 18640a5b6fb4bb170dfa2ae7d6b9824e5bae12861cb8c699f31beb8bf8e183244840dfd4807d1703383fdd934e0dd621e2e24c55b95345f96724d08828166fa0
 EBUILD reg-0.15.4.ebuild 836 BLAKE2B 5f6e3dcef97cdf67fbcc9d07b02ee66a611396fb98831f192e25e5af90fd8c01b9c15f4462008eae7f87174111a1e1f6902237380d7ffe49d151e5525698e0f3 SHA512 6e63c4018a663d0b65a35ea71cefc7dd4d62e3e16c2bc4c79cf38c25a5a2c9f07345f70f3267a356d46214a3092373651692d337798be8facca2b52f028c3405
 EBUILD reg-0.15.5.ebuild 1129 BLAKE2B 0c25fae657e60bb37b2280b65155fada050ab43ab37af842a46c96e8e7016af9edb9548bb847767a19b77d8e9d2e82075cf9a8dc93a8eb3fae59ff00ca2cc384 SHA512 b61ce7b3da8566ed945e7d6c3dfd5eb95675aeda410c861730d99ca2da757d48916c3e02fd412c0a268f72971b8db71d79811f587b996b0e7a78dc5f17a3ce2d
+EBUILD reg-0.15.6.ebuild 1129 BLAKE2B ca4bcb133ca79cf24a4d3bdc8892c45c749ec5452b1d0bdb181e077da8da6b4131c0031ce57d7d21727ef33750fd50d9e68ddf72c38547e7d2d8a69adf205c03 SHA512 97682e6928a03ee72ace0e673c60156e6d25160c239cea0e8bf8b7696ebbbcc7578974a1f607f1e4045b5a8c863049236ae1a3b52dd6a37795466f7878347248
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/reg-0.15.6.ebuild b/app-emulation/reg/reg-0.15.6.ebuild
new file mode 100644
index 000000000000..b09c7ab9af15
--- /dev/null
+++ b/app-emulation/reg/reg-0.15.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="37fbf846946ae60a75e5d30e3d6ba6d4dd0489ed"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup reg
+	enewuser reg -1 -1 /var/lib/reg reg
+}
+
+src_prepare() {
+	pushd src/${EGO_PN} || die
+	default
+	popd || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+	insinto /var/lib/${PN}
+	doins -r src/${EGO_PN}/server/*
+	newinitd "${FILESDIR}"/reg.initd reg
+	newconfd "${FILESDIR}"/reg.confd reg
+
+	keepdir /var/log/reg
+	fowners -R reg:reg /var/log/reg /var/lib/reg/static
+}
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index f16336aad069..523ae16e4978 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -1,6 +1,7 @@
 AUX ski-1.3.2-AC_C_BIGENDIAN.patch 2266 BLAKE2B 26ca07d5e23acd9c3e0a7b3fba78e5b16e2957aa657340b1886458d17f2b97f21c1eca0bff9319d667a28b10efbb72666788d39ca5ba7068eef867302c6945dd SHA512 0970007c99f29dd19d4e64f433cd7addec8a316ec68a7e3c07c11ec3849d70086ba262883eb82f66c0517b9bf2c77399d69d72345ca0e8d9cb3723086fe4a6a0
 AUX ski-1.3.2-binutils.patch 1039 BLAKE2B 72a03fc70b3473ba760297f97cd8722c6f3b9a2dc247f57c07669ab16c112edff5250b5c79bff192ea28bdbc2024bd746a4139863904c32916f969e6e97f4b83 SHA512 b473ed658a5496c849cbb82dfeaa1913834dde60e2da17d09a4a882e87067236ecf25b807281921c86fc4a2cca5461f2a608e1a4c301d4cfda39507bdfcc4d6a
 AUX ski-1.3.2-configure-withval.patch 634 BLAKE2B 3a32acdfd37d7b2622f6add89ebdb5ca0d55a9ef6bb13f78bc4b6d82638ba63c2473bf12f1971a1aaca83f10ad0061a2d16a031bee50f9dcba5cc2c01efcd86f SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec
+AUX ski-1.3.2-glibc-2.28.patch 240 BLAKE2B 279fe68c7ddb734554fbe7e098eb049d710439c9f3cc63dda231c5f8f1e9551909017bd9945f390a4fe1acd82d8bb9f7ead5ac75bfea4103b4af908397df8d40 SHA512 84913716d3b6ed9ccdfac4bb15ddece97013967c5ae4e22dd6ddc7235e013832131e3f21bcba76bc07cbce4d949e149c8b8df6a59ff2141308f7a550eedbfcdc
 AUX ski-1.3.2-ncurses-config.patch 584 BLAKE2B a6876394e368f1f793bce339618c668e9d117c9206455e7d3cf74372b3214c9984fde52753fb453e73d390a3f57011c7a3406a40daaaee04fc8231fbb40d34d1 SHA512 64bd0b4ee7d7e9117f9907eaf71f92b0b74dc4d1c4724845de31820a9853199f8834d3d01afdfb725c389d45f353e2d8b99264aa5ddff5c3067c22e990cd967e
 AUX ski-1.3.2-no-local-ltdl.patch 366 BLAKE2B 1d4de13c62a474c41aa77ec91db2c6c0da51d65992d2d1dcc15518dd34fbdcd101c9df2a50585ef6cc54b71197d9354ad1f4092b80de2e1714986e7744ae83c6 SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81
 AUX ski-1.3.2-prototypes.patch 656 BLAKE2B 6f85c3acd7eff720f7f25fbad77389c16c203a31d3cc00494b0624e38b333fd694912ad5882abc61efefaa033042e9bbb28c932870e29bc7336565345428aba3 SHA512 d1f37e57a0aaea4621a749b94453121f16cd3ce6c51cae4cdde8b6258f5a4a7a63c5b35e8bc50cf43d5462ab8be9abfc4196443e329641622ab848f56e27616d
@@ -8,6 +9,6 @@ AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821ced
 AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
 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
+EBUILD ski-1.3.2-r3.ebuild 1199 BLAKE2B e3610cf87dde3cde3f377fc16a6b8e15de789d679c86d13d778ba6ca6e3b5cfb229248b9797bb2695c89a149154328c6405a027ea9a855095ed7f58d25e396e2 SHA512 0e3c6952539f57f7f778c3c2542e9f4815ffb2fe552aa6d67a2e2e0df5f9e963a154f3ab17ae184a3fc7f87fc3b79236449415135dc6c1627091095f1ea34cbd
 MISC metadata.xml 335 BLAKE2B 079d4ba6e17a3d3351d2ca5021c67a7a87489358d5d0541e60e41105511b36f203713605fb76b84cdda6a799d63a51af0923ca4c58c7c482ca13626d3938136f SHA512 4b9ac18f2d0cbb672eb1af814e0f09a8bcd5b2f9f4cd1f1c30efff18ae2eccd2ea4f166cc3446756733e2bcc581b9a1f7ab62a96234fe9e02f649eac2a011b20
diff --git a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
new file mode 100644
index 000000000000..f09c5b410563
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
@@ -0,0 +1,8 @@
+--- a/src/dos.c
++++ b/src/dos.c
+@@ -51,5 +51,2 @@ extern int localtime_r(const __time_t *, __struct_tm *);
+ #include <unistd.h>	/* Also #includes <utime.h> */
+-#if !defined(__FreeBSD__)
+-#include <ustat.h>
+-#endif
+ #include <sys/utsname.h>
diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
index 3ca262479f5d..a6551f5c0b89 100644
--- a/app-emulation/ski/ski-1.3.2-r1.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit autotools
 
@@ -12,16 +12,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gtk motif"
+IUSE="motif"
 
 RDEPEND="dev-libs/libltdl:0=
+	sys-libs/binutils-libs:0=
 	sys-libs/ncurses:0=
 	virtual/libelf
-	gtk? (
-		gnome-base/libglade:2.0
-		gnome-base/libgnomeui
-		x11-libs/gtk+:2
-	)
 	motif? ( x11-libs/motif:0= )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
@@ -38,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-uselib.patch #592226
 	"${FILESDIR}"/${P}-ncurses-config.patch
 	"${FILESDIR}"/${P}-prototypes.patch
+	"${FILESDIR}"/${P}-glibc-2.28.patch
 )
 
 src_prepare() {
@@ -51,6 +48,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--without-included-ltdl \
-		$(use_with gtk) \
+		--without-gtk \
 		$(use_with motif x11)
 }
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index e1a354b16b2f..2c9d8201fc4c 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -1,19 +1,19 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
-DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
+DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
 DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
 DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
-DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
+DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
 DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
 DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
 DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
-EBUILD wine-any-3.12.ebuild 20976 BLAKE2B c4cd44658b6c31162fe961c52b49a61509c1efa9aa5de4519888168cbd57f602f58b0a055e6c6cc0027327741917d8826570257496ea6c7eddb9ec7065090b6e SHA512 ccfba82dde9bbf39c30a11ae1d08dd79704f9f6f89c177a356fb3ba29267b71c8d7061fd4e75e00036d2aab4925b4c5bb4da87db88373144291bb0b195a0e9bc
+DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
 EBUILD wine-any-3.13-r1.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 EBUILD wine-any-3.14.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 EBUILD wine-any-3.15.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
+EBUILD wine-any-3.16.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 EBUILD wine-any-9999.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 MISC metadata.xml 3643 BLAKE2B ced8978273d0254eccfd90f9e0f929d6de1161d9299f5f39e6381de0daa2f0a62fe59016b3c4bcb005ac6b4f329b9451e9e68412b723e4b173d0d59ba39eba40 SHA512 b4b14069065e796a337e5f3b28659ab5d81dc04041e73d08d913185778299b5b9bf793d04bdcee01fe30b1264826b02833aabe2b53b409f3e6699d84106acf5e
diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.16.ebuild
index b418c4871467..66208fb6657b 100644
--- a/app-emulation/wine-any/wine-any-3.12.ebuild
+++ b/app-emulation/wine-any/wine-any-3.16.ebuild
@@ -139,7 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index b05e54429835..1f7af4e1eda1 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
-DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
+DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
 DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
 DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
-EBUILD wine-d3d9-3.12.ebuild 18592 BLAKE2B 1fb787cbd7480b5e53e39826de317b17e2d3f742079accf6718004e74ac9e6269d66f32b1f382376264f8a0265c90a6b255fe826a848279b07a6b1f9f39c60a8 SHA512 80c4a209851244b4adae5709184bad8fa86c7fc76768d4714fdcbc3ac700443b4c8571cd59cd389028b3ef7b089493d64b4ab3b532db0a266b4db4f25244a731
+DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
 EBUILD wine-d3d9-3.13-r1.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 EBUILD wine-d3d9-3.14.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 EBUILD wine-d3d9-3.15.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
+EBUILD wine-d3d9-3.16.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 EBUILD wine-d3d9-9999.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 MISC metadata.xml 3320 BLAKE2B bbf5e79928f29d124d8a7dd947aa42fdf690d0d7f8905a0e0f43185b7026d4dde787809844ce230c3ab285a3c476c807973b899589d0d383931c96c9f1d54966 SHA512 14e380383fa5345cbd6c5366456f8d122c7bccbf54db863945e5c7673457f29f97e629ec3538030bd991f254d0262045a2d97a467cb100e80e1989728ba65c96
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
index eba28b4356e2..b92ea182b4a0 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 10087ba2075e..4abdc9d992f0 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
-DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
+DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
 DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
 DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
-EBUILD wine-staging-3.12.ebuild 20008 BLAKE2B 8d0beb7ce56b096d9e93827ebe9d39736bb45048d7994dd259a800d81f238f0ac855802af4ed1ccee45d5ad4c5175cea70a1b3315fbb792f1472546a79d0e1d4 SHA512 3c6c2e2f7c946df4b2225d78914ee613469b3e72633f757321f336eaa2aedf63239319db5770ef4c5ec15476333151c0d68e5db04cb1548d35fadd4d299f7b06
+DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
 EBUILD wine-staging-3.13-r1.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 EBUILD wine-staging-3.14.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 EBUILD wine-staging-3.15.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
+EBUILD wine-staging-3.16.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 EBUILD wine-staging-9999.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 MISC metadata.xml 3470 BLAKE2B 683b5e57f446a5b16aca729521acba46253b5977bedcd519deedf2c7745c0137b69c577d837e99fcdecd6c247f18078d37ac2e9e2e3348a2a302b2e3caf9940c SHA512 9170c486966e9ecdd04d33c05d14c8e4086fe6d3d93d86370424c02046a68dc970d17be6de1f4f976ebc6f7d4a8a40c8d9b0884743133752bc3d14242bec5a64
diff --git a/app-emulation/wine-staging/wine-staging-3.12.ebuild b/app-emulation/wine-staging/wine-staging-3.16.ebuild
index 5f2b2ece3de8..2977288b1ee9 100644
--- a/app-emulation/wine-staging/wine-staging-3.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.16.ebuild
@@ -129,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f5862340d6d4..89c6a24fc2ba 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-3.0.2.tar.xz 19726920 BLAKE2B e108f851b2d893b052a26ae4368f3337bebcc81bb9ea9abf93c5b7d6e01e613ce6e5db98696ab6ad8e266f6f0f0b9c5ddccb66ae7ba7183912a7911fac4b9633 SHA512 dbd0f242c5eace297ad16e314b8ad139e7d430de7eb8ca52b2006d0b80db4809e28a0e785d404a65ea1acdb56e7f06ebfc9a50071db1edaa6180c8835e7c4b13
 DIST wine-3.0.3.tar.xz 19735412 BLAKE2B f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8 SHA512 11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
-DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
+DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 EBUILD wine-vanilla-3.0.2.ebuild 17123 BLAKE2B 5aef4adb2ece22b4abaee6fcff8fc28aa73dff048c09f7dfce3314563bffa17657c35e243b9fa689f8ffd94c4dc266b32884f2a85d8161da76ec9b6dedfb0413 SHA512 eacd129eb9d98f3d46993505d81fb70bcb1435a9cf371fb1ca9a512edab6d235ec5398241a5db3e5281e5c677454b43de8dfbd15ea63c7b927db5dd5d3885904
 EBUILD wine-vanilla-3.0.3.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35
-EBUILD wine-vanilla-3.12.ebuild 17348 BLAKE2B 1381f5cff81e8e69fde118fb87fb2708f6f082779ac1ce3b11a6a97072c99de3e02a8d652124dc654d1512876ada634335d14c1a527674094907d199cfe1c5b1 SHA512 faa2a67e359bf7e2004d8c476e92ad533a76ee6f23f92798cb9101e58e611415b8ca95a7d37e2a821ed543068c812a61c4d9552df9b20c7814875a12af0a3b81
 EBUILD wine-vanilla-3.13-r1.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-3.14.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-3.15.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
+EBUILD wine-vanilla-3.16.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-9999.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 MISC metadata.xml 3082 BLAKE2B 5ddadb49dd2e5b9da259d3313e2406e37871271f8261e9501508a50220a8ea31a68185d5fcecce968bc4f4915de6901060d980476ce2ddd61d1866d2766b0cfe SHA512 fa40b440a418dd442bdebb7914c84f648f74a18286f91d59726cbfefa1bebec8afab1f9a7b6ed8c7ae2788253dcaea9dc13cb4eff09ca6da56370e280952be70
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
index 1336c2357bfc..9a0d8ea7f20a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.1 )
+	mono? ( app-emulation/wine-mono:4.7.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index cade7363e4e0..8b0a86df0bf8 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -6,7 +6,13 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
 DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
 DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
+DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
+DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
+DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
+DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
+EBUILD xen-pvgrub-4.10.1.ebuild 5054 BLAKE2B 6d4135357a7f69691f97ea37c78e6523636bee9210f562e8498d61f2fd22121f3727ffa55a18968fe4bbc2ddcbb86f90bf645b5b0e23f2813d88df0bc811c4fd SHA512 d6c61408bbc9a760ac00923275ac8c56bc59cec06b6d642458ec2da89c62ff4a74620e23f984dcee9f60009d421ec55381d5ef6936588da6fd1dd424f62dd787
+EBUILD xen-pvgrub-4.11.0.ebuild 5055 BLAKE2B 5f36d5ea8e6ba604c4a37cc5da0c7cbf69c481af1e0c241c92fc04eccf21d07960da278a61ca9a416b7bd2375018526ab511e0eb850c1d3411c16013530f8b47 SHA512 de08181157bb50a73ee007e0ac8d335d7830cfe9094381a361d7b60fffed44d71506e6d4c7a8339337025c4a5dfca7e2d44084ee004b882d4d29bde863a05c25
 EBUILD xen-pvgrub-4.9.2.ebuild 4867 BLAKE2B aa2e4f8620adc7c978d2ea86b5304df90d31062440d6b7039336f30882bb02eb4ead8c50ba79045b1477abac7a651c9d00bae0cf8a72c5576d85e00ca660d35e SHA512 dccfd9eaa96a8e12e9f60b2a864f96729568bd75626461df8792e47356d8a4829605f690bbbddf648077c1f27609b7aa622687298173f6a86c8afcd19f2dcd3e
 MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild
new file mode 100644
index 000000000000..b026a94b44ef
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=2
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# 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
+
+	# 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 {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+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"
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild
new file mode 100644
index 000000000000..5d15b2bf7afd
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=1
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# 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
+
+	# 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 {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+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"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f516021dace4..8f9baa3703e3 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -31,7 +31,7 @@ DIST xen-gentoo-patches-14.tar.xz 36244 BLAKE2B 94b751df0ae9a49d1c52ec5fa835d4a0
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.0.ebuild 13952 BLAKE2B cadf3444af9c72c47c992fc78a002391dd5d2061b3897468b0b1cacbe80daab598134af9a2ba205b006dab8688499b8c712b2b4fd0dfcc2060964fabc02540a3 SHA512 626cd2d7bfbb5e699223792ce42951d565e1cc911233b82deaad46fe227411286b1a1521fa7b85cadfabcb2bbcd4ff0ec031f3050f0588edaf8589127c1096b8
 EBUILD xen-tools-4.10.1-r1.ebuild 13994 BLAKE2B b880db4e806ca2f06f0886e0ba49d73057b023082679b3cf2b4f79b99714fc0651ca0cb5f5261702446218a5da36bee67bc919cc55be83c722ae69aac67486ac SHA512 7dab694d492d27cb6880ea4f45c90c0f89d1ae5fcecd2aa7199e4ba97c799a44b3b464bc3236ad32ddd07b76fe337f99af34807ccaa5d1f278ffc55c42f4d8f4
-EBUILD xen-tools-4.10.1-r2.ebuild 13994 BLAKE2B ba7bdaa1465978ec5d37492b7912f41078024fce2c04dae7d1c0ebdf100e2c788c92fac0d0bb5316de57efc9e9f7787e36d46d852a1a7f078be30d8bc52bfe19 SHA512 01593a89551ceeb04b963a4d6b7547205adf0ca96f191a883bc7a89449801aa5cb10078f9ae49850cfe6de7f0c619e5858e8115f0a2f0d15386c87760207048b
+EBUILD xen-tools-4.10.1-r2.ebuild 13992 BLAKE2B be68b8d08e2573cae3f9af96a5454f69a502884ae02375f92f21c8e46754ca8cdcb7bc0e4d179f2f3187a87e3d1612a287068e1d9990ab67399de16b4e173536 SHA512 9f1ade8aba5d7eb7fd7f59de57aedba3df7700178c9cad913a8dcd1b03374ab48391f9c1de74a3129faa962117b8df02f5cf92f2c2ced9c5e9df75ca3ae8fc92
 EBUILD xen-tools-4.11.0-r1.ebuild 14042 BLAKE2B 9a1ceba71fd79ab52f11a305d35e123007add10f42ca620e87567f438a0298ccd39e6ee42fdb5bd1de6d4a34c2d32f6a319a78e904e45c5fa2113fff7e6f4e1c SHA512 c438ce83ceb481e90d25bbac38020759e154a1c2f00d9f31ffb959885aeb2576177e7fca9387cb53371be6e0081d1d4d05593ce7fc22be1a363919874330ca0f
 EBUILD xen-tools-4.11.0-r2.ebuild 14010 BLAKE2B 947d246f47931527f6c998af76eb8f9db7d1a032fb9570e544fb30bdcd7eeda88893d8baf7924fd5283eac618bb462eca6a0e1f585777467655036d571663f9d SHA512 6fb10569080275314abb3e65ca3951ea01fc547616dc3cf32f621465258fe2635456626e90af097222959ab007e0d4c81d9cb7dbc996cc836d0f5d5f43ec0fe5
 EBUILD xen-tools-4.9.2-r1.ebuild 13729 BLAKE2B 06c044904e8f406ddd1e1cd1878f1a1477452e37033f749095a164cdc39a1cd5858da42cdcb70d125dc7241ac4991f2a4cf781ba78cc6eeef3b9d1797058a359 SHA512 dec7d7001832259ab31035b310411896cfba3e1a6d83780fd259fe8238033c58da39aed482f61b35bd295e9c0b12e8580367d3603f01ff81ffa1131d6bc713e3
diff --git a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
index adacfc22b1cd..57728136499b 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=2
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 53ec678e06cc..2cc185598d24 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -11,7 +11,7 @@ DIST xen-4.9.2-upstream-patches-1.tar.xz 13812 BLAKE2B fe8bf636dea9fbd21c9fc4328
 DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
 EBUILD xen-4.10.0.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911
 EBUILD xen-4.10.1-r1.ebuild 4819 BLAKE2B 72bfc9525c0baaeebd6e12351bc38c0a45290cd50f2b4cf19f19bb250306b9a305ee14ff7bd7e3e3697fac9187c596647290d5e8cd2eff99c799d2cfa9a894d2 SHA512 56b92a8a629bb290f0cdf1e3c72438ce7cdb8f5bf77ace6e5113ff503d1ab745ad926b288cc69e7d3a4636cdb05004dd8a7505e277c9144414fb608d1ec4c8bb
-EBUILD xen-4.10.1-r2.ebuild 4819 BLAKE2B 3f96e8432b7e077bae943d9a0d81f9d4ff7ec21ed7ecdd71d987b3c145bb4297c72528831cc68a17419abad70888173a845ec9f81a4518a82f6d20bb6f5de321 SHA512 85033d2bda31bc9ee522aae9414900c49ad1de84c047cf7858ced715cd9fb01a8407a92a5ecce3d6db136b74edd16214e4e09a94ceca28445b741d1b15264274
+EBUILD xen-4.10.1-r2.ebuild 4823 BLAKE2B f3d9b58a962ff238a06aab52bc4a2b31f7fddc96ead762e76ea732cd7582598d752c96e6f3f8ed1f79fc30183bfac2113b45af43e8cd3c13ad17518f239240d5 SHA512 99a36b4c11f517eeb3d2c7ac047a031f4f1c3885b6a01390522e05697c9470c6da4014cf34498800b381aef88746dedea5c2300e7c43146f48d756777a81d8bf
 EBUILD xen-4.11.0-r1.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911
 EBUILD xen-4.11.0-r2.ebuild 4819 BLAKE2B f2f02a3fa62bf031955b7d09e98b0028a69a98504af2fbfe6943fc74ca552245ffe014c8b746ce7ab9eb20bdc5d31aaf320f23ad682b44c9dc2e103f5dcd2e0f SHA512 e167c117f8f027a9ff832fbe27f33b0d40ea35a9cf3c958c9fb5ffe82b0c91a3ee086334c9da7c2d3bdaff3828e9b371945b59e0b6e763223f4f605802ee5dfa
 EBUILD xen-4.9.2.ebuild 4719 BLAKE2B bd5c63e4ed7046568f8276c0a5b65c1cee97e07e0410eec66324b7625619ed6320282181c9b10519f683c54cf22fd0af1e7bce14d5558966535b2393e6136af6 SHA512 3758dd6eb2323e30e9e77efbc46917bb16fed2f8380967903582d0c834d61fde1caa7902d96e5846af6ea4f0b914d64aaac2a58ad75c695e8a7c389e33f4971d
diff --git a/app-emulation/xen/xen-4.10.1-r2.ebuild b/app-emulation/xen/xen-4.10.1-r2.ebuild
index 4aa52ebfe2bf..e8efb6489997 100644
--- a/app-emulation/xen/xen-4.10.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.10.1-r2.ebuild
@@ -12,11 +12,11 @@ MY_P=${PN}-${MY_PV}
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="amd64"
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=