gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /app-emulation
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
84 files changed, 1426 insertions, 253 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cf78c72acf13..e21248597399 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index ddbe3fa6b130..ff114e372131 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -6,6 +6,7 @@ DIST buildah-1.6.tar.gz 6296936 BLAKE2B 1c5e0b1a8d3f3be381c0b7cad5c52af95ee8977c
 DIST buildah-1.7.1.tar.gz 5048407 BLAKE2B e76cbc95ce835eaa26d53f6ce74b9bbb0d4d5683f91bdaf090158ffdc3d223a522a825af2d99d573a5c3cd57445b4d7c3d4aff359454beac81244821367ab3d7 SHA512 4b62a604dcae7a8fd0a1d74186c6f5d4a5288072b014d51d929f68442436e774428b99e62a78504314cbec517254f29d79294dc6c0b30a999788c9af12d0be01
 DIST buildah-1.7.3.tar.gz 5083873 BLAKE2B d366657c02c475bd57cdcd29cf3341098c2855af834a9aa97f41b8950ff1dd29ca0fcfed093a980e67e9c1a2ccb76e819386560a48943ebd6abc106e2a4270ea SHA512 492a4bf054f00d7da3b9edc6ce8e68497adca74895561db7025acfcd3767baac1e4acbabffedafd8becf15f884635f42c699bd57370238feacf4bded51565a75
 DIST buildah-1.7.tar.gz 5041530 BLAKE2B 5a30cd75783448cfc0df8167406669c1b687781e819513c11d2941087aa4ccc1b87f10acc6e4a77de5dc991435640aefd6139ee9bb66e5952de63d1593b6fab9 SHA512 fb44787b59c4ba26bc9b38ba434c6eeebbdeeeb3d28d44819bfe05c42e1a8db63e41d75382d8f25c2c72b44c7512dd5f5b7f3e4838afa40fb67037616594f8c0
+DIST buildah-1.8.2.tar.gz 5102103 BLAKE2B 2e19f8af15e5f4a3c6488a44cc0f51592bc6f5201f217ea814daf4b08691f08170debfa2de01d39ae20c6289ed0915383b958cd5e59d8b598d867053ee990af2 SHA512 0cb8dc62c4139a5b500d4021b05344c70c1ec86ff9850bcca87011ad522fe95981d373d73b30b7899959876d78cd15e565e034cf136aa271a72fa4810ff34cae
 EBUILD buildah-1.3-r1.ebuild 2054 BLAKE2B 0451a2f5b941d833d4df6568bd0cfbbe631c80bd17d76c13fad1c522997957656f6133b030ee005c1f2c107188d2f24fc22b48af971065a096ba2c5025e9e994 SHA512 e5d7586db5cd9b3af24c04a147ec48d3d000dc73910fcd4222b44df94d02a92ebb37bd4cc2cc71b65dc9f452208033a5ac4633fe042fadc103b1e503bebfd865
 EBUILD buildah-1.4.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
 EBUILD buildah-1.5.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
@@ -13,4 +14,5 @@ EBUILD buildah-1.6.ebuild 1412 BLAKE2B 511b9dde818042cfbe49bc07d161888ea3383f80b
 EBUILD buildah-1.7.1.ebuild 1445 BLAKE2B e6316ea435fc2939c36911ce2b4b8cb7ea7ce39184fbc41b7a7812bd862c9d63dd77304774bfdc6dba64b153037451ea1d7df34cb47f2fb34241db18db5bf1b7 SHA512 bef66d51ea66af068b3f62cc085eb03142d8062e92f4b3e4ad8bdab63bd9a839318b6fda354ca290230c2a59b8234e5cc32a255f499bee96a5829f07d694f612
 EBUILD buildah-1.7.3.ebuild 1445 BLAKE2B be5ee08e333c3176a7b8d12320df4c066ed79e01ef41ca5d7614416bfa023b1f4c4ac08dcb6efec3fbe1f634e4a4ef764c2de42f45f19619a0754232ab3af307 SHA512 23b89c68496a9d918199408eb67e19161d71fbea6f1196be33af93e385c6dfe8146b063288f8ae4f0e088307769e2defb9b4aba1e3601755bcc5f07063e67a31
 EBUILD buildah-1.7.ebuild 1412 BLAKE2B 799ca0da805e15f418189b6b82084f94c3e47fce4ae6ee3dbabf9fcc4d0f79d2b3d6db9017ebd6c203d3ca9c437623fa6e08af255410796ca423e94cb574dd62 SHA512 14cc66b762cd3370ea5f21085db4d69ded6ddeb64cfe469b457436946e253ec135fce320a60c54a4edd2cdd7a3277c6b937f80faae662df832f1ce807d8c3647
+EBUILD buildah-1.8.2.ebuild 1446 BLAKE2B 7aa85e0524562984a193be82821bab78f0c14815837f734ce98453db951e0c79f876c539c8421ea6d76daa7a7d2689b8f523877d3cae3f89df667c2cb4537e7d SHA512 ce3dd70e54209634f4e21202ed766fe43bcf7ea8bdb049efc10b4ebbd7a08221ada5804d28651f2bdbce6fc788b415f1967da306037600723affab02105737bf
 MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
diff --git a/app-emulation/buildah/buildah-1.8.2.ebuild b/app-emulation/buildah/buildah-1.8.2.ebuild
new file mode 100644
index 000000000000..0c4df769d329
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.8.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="e23314b"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		ostree_tag.sh || die; }
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 174a07a9ccb8..1f0740b03b55 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -21,28 +21,28 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
-EBUILD crossover-bin-12.5.0-r2.ebuild 3835 BLAKE2B 8e6207e5aa87368e5ab419382c1158e3db9eab0947ba095675d31860216c83abe15ce2f6207f22bf4b2e7faf5aa6ed6f184ecb5d6f4570c5b881f7f5ff419bba SHA512 cbdf323454aeae3ffb3246df4e1521e3e22d1d24be8d7cc9308df4bc50616e523996f7d809913fc0732c0f4f2c5b559c20d5ad00871e06724c33ee53798239cb
-EBUILD crossover-bin-12.5.1-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.0.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.0.1-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.1.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.1.2-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.1.3-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-13.2.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
-EBUILD crossover-bin-14.0.3-r1.ebuild 4211 BLAKE2B 51c73f0160e21ed64abed2d2bb96cfa5171cf5ddd763477fd3ec9c0dfb176251c70f7b9ecc60a8a1200dade110f6084949d033a7bd376b62871380c12a7a407f SHA512 fe52671e372ef47dc7f91ac08cdaf76a55b66b84c3f023bcb31e1c96d56f7b010939e958fdef595c8cbc4f85d5eafbe0cc41f0a279787cbd11d743847da5f7fd
-EBUILD crossover-bin-14.1.4-r1.ebuild 4212 BLAKE2B 12346668bb41ce0b145b84fe0cf4d9e3ade81744937aca78f7dab32d4e2b9656fcb59bb8105c1da3ecb367f7d106be5d9a4c80ecdbfa70dd04064e383468eb6f SHA512 835091a0845cdd1d8883d90b42d9567421bbc29254a5de54169fa8ee69f67062e2eda873522f29763222b555d93df2250b3ce3290b210f64768e07f9f4288bfe
-EBUILD crossover-bin-15.0.0.ebuild 4542 BLAKE2B be26c45d4b7e4833747cf3e031182d40fa5eb0fc19368fb365365d6dcfeee0ace7a1a39500210d0f59be03c17f3305c2bd9563297a69e6b9a550385db11c46df SHA512 102ec475e2a28b73e8624dec0a4d868889c6a73d5a8be244a1a4143b492fda277f92f3b55bee15b4ba5f013aad841be50516a8fb2763869ace99cb38b66fca2b
-EBUILD crossover-bin-15.0.1.ebuild 4714 BLAKE2B a96df93929139cd7813bf7d468f25dc26e3d000d5ca50778ce7ab57232322b4055cad5452080633ea88b299f14fe25c1cf7bad28067deab37eb8b5aa6f52c0a2 SHA512 47dd8882420d4c0b79c97ce1d848dd6eb7dc0156cde5d11b9b74fd2113ebbb89ea5d014211413a12720d3f02b8bcac5dc7e8097d8456157f74606e40affe068c
-EBUILD crossover-bin-15.1.0.ebuild 4714 BLAKE2B a96df93929139cd7813bf7d468f25dc26e3d000d5ca50778ce7ab57232322b4055cad5452080633ea88b299f14fe25c1cf7bad28067deab37eb8b5aa6f52c0a2 SHA512 47dd8882420d4c0b79c97ce1d848dd6eb7dc0156cde5d11b9b74fd2113ebbb89ea5d014211413a12720d3f02b8bcac5dc7e8097d8456157f74606e40affe068c
-EBUILD crossover-bin-15.2.0.ebuild 4889 BLAKE2B 147afe87438d813bfe696b7b4135ea5c5d8e6f7356b18ed4e10deb28db99c067a03319ede77a08d2e2f74071e883333f58bf8f506e73d098802bbf4e75d8fc46 SHA512 e8ef43b3bde0af61207413777673f066ad2ee27e3396fac9fffde2d385b814c331ba4a3595a3858d5e9752c6e5d247dab07e0d3842edb99aed815b549e4448f5
-EBUILD crossover-bin-15.3.0.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
-EBUILD crossover-bin-15.3.1.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
-EBUILD crossover-bin-16.0.0.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
-EBUILD crossover-bin-16.2.5.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
-EBUILD crossover-bin-17.5.0-r1.ebuild 4726 BLAKE2B ce87b80217b5161d2abaf681c9348ae519bbf4547bd0405627b74cf02414e1b3f347afb0ff9f075b14b8fbca65526c54837acc849d8623d4f10a310d5a8818ae SHA512 51acebb632d091cccb09686a9ce9fdea67fcbbeb2054ae63b48a3fe7321f7036d93d143124b4023a3e76003bd4acff57856d02ec7af478e5ae95f7f5dc2f7282
-EBUILD crossover-bin-17.5.0.ebuild 4692 BLAKE2B 17c98f5a466f223710cd3d9245fa42138354797a1a8dd7dfe6ca1d943e4fe7775884f93a99c472ead60f08f8e2da7ddfe25dcd2ea5a0718a89b51ab5a3566f05 SHA512 b0f161809b491d4ede37c250af2fab225c2c7f574d7bbb4a13fc70037d46561074573e46809a0f28952ad77cc2726b6b9bb2f62acaa8c138c05e1293601c3fcc
-EBUILD crossover-bin-17.5.1.ebuild 5240 BLAKE2B 2cb2a64bab5581cec4f1cab04c73775059b2f2c4d7ab3b4635204a8c1649ec7df9a615f9fb910e74901c48e27ceb6deb17cace229f8b638a7fbf31403b296c9f SHA512 26c63fd19ab3d231d5cadf737c7c8864fac798db820a74cd21e63e0d48c2b789b75bdfbada6edd6124ed74dd62130d95db48e932813e09f21ad7ecf37bc5e18d
-EBUILD crossover-bin-18.0.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
-EBUILD crossover-bin-18.1.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
-EBUILD crossover-bin-18.5.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
+EBUILD crossover-bin-12.5.0-r2.ebuild 3826 BLAKE2B 24425ebe8a3b3a72d79a2e220100f0f20b9920af6c63bab4076311c7e090a5b8083db760f81c6187f749dd7ea90e5a518daa76b1379f86399bec5c492a5fd29a SHA512 11a19adc597929fd09efb0c6abd674f53e848f025cd70e26d5b2265ac2f54361e919b08925941c40c40bd4c041603396e5d5447f46c36d67547723437739032d
+EBUILD crossover-bin-12.5.1-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.0.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.0.1-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.1.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.1.2-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.1.3-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-13.2.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
+EBUILD crossover-bin-14.0.3-r1.ebuild 4202 BLAKE2B 54eaad65c84246b4efcc582e5575a9c433f653298b90a5f69405334814ca4137b2e7507ccf3e8a95bc472f9862dc191b66786c5b45aaae0c17026269a6552445 SHA512 a580dc1b502ddf1e0ccc01e24d80875999f67ec1d2dcdf1f44a5c467226ff860f1f78d5ba0c2ab2fa4e211b5cb12bd261f1e90596dada95ff17686a789bcc676
+EBUILD crossover-bin-14.1.4-r1.ebuild 4203 BLAKE2B 6a3c1fc549093cdcb91dc68b17de25aea61d1d4f45c0d5adcbc1a7129dc5b68ad6a40ba5f8d18fe5961333665061def45f8ef59174eca4c9416421d3ab74ea0e SHA512 97df061f5abb23afd055059e50bf8cadb026d4779f2cbe2c1091dffd421e620bdfceee3892434c79cf99c963d31da7ef253cc3693d475bc19767c0994dbbb4a1
+EBUILD crossover-bin-15.0.0.ebuild 4533 BLAKE2B 58f1853b557e183a756b6ce3602db8a006b72ecb30c518e963c29e01706c4efdfee00b32fec8f86fcffe2ca2842576d765e3778ca363fc47c100c2531cfb6a60 SHA512 b5f548942d2e6a201e10be7f779e42da00abde0585a66ca76e68f9ea03bb4f878f38503c4e1a9760dc9df117c747cd73082a0569f7211aa851e542fd4975c038
+EBUILD crossover-bin-15.0.1.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
+EBUILD crossover-bin-15.1.0.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
+EBUILD crossover-bin-15.2.0.ebuild 4880 BLAKE2B 67c2576099eb4a3597028ee572e5766c71b10486cfda3d996e03da8e101d15c7f7901a24fc89fec5937b592b832422c419eae892144727ac4c6f8580557c72eb SHA512 c0fda036ae10a6cde2608f19fb834d70f405ac9b82543ca57b8f7db9bf398a337bead90d4444c234cfcfd1dcdd8517df9f552fd98fa9d87f034c70c71eec961d
+EBUILD crossover-bin-15.3.0.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
+EBUILD crossover-bin-15.3.1.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
+EBUILD crossover-bin-16.0.0.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
+EBUILD crossover-bin-16.2.5.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
+EBUILD crossover-bin-17.5.0-r1.ebuild 4717 BLAKE2B fef287182c10957a016dbc0a19a0104ab32a24b3c6cb6e43d842d515b72f517c1545a9f44979407abc81b18d63e351c63b05e8e1ce382508da80c570901fe978 SHA512 62925290cf4ad5256554464911f2497b39cba31eb35d19445f921622da2655c53e08091f2240de944142bdc4007b33c78fceff153c0c8ba782b6fd7ed3b82dc9
+EBUILD crossover-bin-17.5.0.ebuild 4683 BLAKE2B c8a09c253f81372861ed98b1fd8ab09ebf80016b1cacb96e4d7b20da0548f763be8feeeb9c69712d27203baf776cee9e087cbe87d3213a8644491eecfea77206 SHA512 ad38216f7f65f185fb4dce4f6705ce95b74aaacdb1daa81024a25656e5861bcef7e715b87cba5fd89d0417cd60b330c99db1e950cba646faa1a3b2cdb4f3fb32
+EBUILD crossover-bin-17.5.1.ebuild 5231 BLAKE2B 35ccaa8865e6f3fd3066e794c280c170249632506c8731a2eee5c86780881bec8604f94b3d5b1a41040cf882c1520de49850cedbcb5355ab2f4dd008a8fd8cd1 SHA512 2cc341a8f0cedc966092093de56a8f6c8fde8924c58e68cfd751a1e6f0fe549ef282dd64f340f5f4cbe9ed58b6e1735cc7e0e9dfccf0ad475481726e5bdcbf64
+EBUILD crossover-bin-18.0.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
+EBUILD crossover-bin-18.1.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
+EBUILD crossover-bin-18.5.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 39f5ad2aa9da..cd406f48fce0 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index e3853f9203b1..b9bafdf34a34 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index 5b3093be419b..5059344edfb5 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index 3c3f71614522..26db02be05a9 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-2"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index ce07b1ed007b..21436e43fba9 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index 5c2cc64229ab..68a57637b478 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index 5c2cc64229ab..68a57637b478 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index c980e47e967e..6d80fc91d2a4 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index 98bdd0b207b1..3807e0c09dab 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index 98bdd0b207b1..3807e0c09dab 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index 98bdd0b207b1..3807e0c09dab 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index 98bdd0b207b1..3807e0c09dab 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index 81de56bbbccd..ab2b592f6b15 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index b60ef201ecae..f2070b72ee7e 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index aedc0eaa927e..bbb67c346a25 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index f193cab1f49c..23b837f132e0 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index f193cab1f49c..23b837f132e0 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
index f193cab1f49c..23b837f132e0 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 
 LICENSE="CROSSOVER-3"
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 6afea585e5fa..5b9eb8a36e35 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,8 @@
 DIST diskimage-builder-2.21.0.tar.gz 409367 BLAKE2B 25c8a819be8674eee38a97e822151527dd77d3f5e85016ebc1a7fa5bf907f64bdac47012eb748b69273b519580c6ea4ca845abd7800ddb4e3f60dd81da546a73 SHA512 51a871a772fd4ae35d0a8ea51f7c01502c374805f5de5ab37c2f18ea868a829c7085ecaa6a62690e8d6e85afe225cbab7ed86266eb5fc3e8741a8ff968cb35f9
+DIST diskimage-builder-2.22.0.tar.gz 410939 BLAKE2B ff5b3ce0f128001091e4621170def71cb6ef46cc278aee5a877caba0a3df054ac5e7027640a70ffdd8b8329764774ef801b0c0ad427babaec09a7123552edb50 SHA512 e051b668a86a4b386c2ec079a8f28bb5ab54ee6dbd1f39d7889075efa6abd4dff7063be24b817e05057f85036202f6193438df1a112009a1b954eaa4bb1b6e44
+DIST diskimage-builder-2.23.0.tar.gz 403817 BLAKE2B 14b67dc456bd9dab13a534f0f6df27b8a74514966ad965b401d33274d37ee2f201fa1dcd64b2c04a7503ab1f6a893dc40b5145c9559a7be74a029e2da226758a SHA512 89b2ee7eda56c610b9c343edd51276d54eb129ce319cf7f0fdebbccd1bba52903d16a71f1558bb76d2011d5267ffbc62bde94f5d7fd5aabdab2bc82abf10c685
 EBUILD diskimage-builder-2.21.0.ebuild 1133 BLAKE2B 5d4b5d91a92fe4ca0a41612a58b0844a1d72475e73b3db8d0edd3ef66a90b546352608edbb5ca183b108910ee8f91cf1ec799a542e22472493730391b9b90fb6 SHA512 acbdbcc2c8d228a90bf979f5ed7054e362b86d16ed6e6d03e2b7eb4d8bf66dcfe7832ea53399c8c59d316aa374f6199319358fee35f3640e1bf562c3ecdd73cf
+EBUILD diskimage-builder-2.22.0.ebuild 1260 BLAKE2B 9130de520e2faa02b1084965a03e43d7f4eb7cf1fe4c32ea1177fe78e450118f265675b3c22f3be3044d5acfaaf32d6b7da3491eab146b790f30c2e98f9e7896 SHA512 76ed1128d3c46b6626995f266480eaccd60c316eedd1c969559f7920d414664fd37e515c1a576443bddde13a22b278c84c9d87a5f550c9e5365cd7fa7ac8e5bc
+EBUILD diskimage-builder-2.23.0.ebuild 1260 BLAKE2B 9130de520e2faa02b1084965a03e43d7f4eb7cf1fe4c32ea1177fe78e450118f265675b3c22f3be3044d5acfaaf32d6b7da3491eab146b790f30c2e98f9e7896 SHA512 76ed1128d3c46b6626995f266480eaccd60c316eedd1c969559f7920d414664fd37e515c1a576443bddde13a22b278c84c9d87a5f550c9e5365cd7fa7ac8e5bc
 EBUILD diskimage-builder-9999.ebuild 1260 BLAKE2B 9130de520e2faa02b1084965a03e43d7f4eb7cf1fe4c32ea1177fe78e450118f265675b3c22f3be3044d5acfaaf32d6b7da3491eab146b790f30c2e98f9e7896 SHA512 76ed1128d3c46b6626995f266480eaccd60c316eedd1c969559f7920d414664fd37e515c1a576443bddde13a22b278c84c9d87a5f550c9e5365cd7fa7ac8e5bc
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.22.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.22.0.ebuild
new file mode 100644
index 000000000000..bda4c2798bb7
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.22.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
new file mode 100644
index 000000000000..bda4c2798bb7
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 4bd072a9a5c0..fa97fb6bf6d0 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,8 @@
-AUX docker-compose-1.22.0-setup-py.patch 1763 BLAKE2B bb4c9cf7213b6f74115a61aa625dc8eb15435d958d5fd6704ca6f71bed2c3cb56f4d63b2c7a67bc6d78ede19f7656b9c56e04bd65c2e34ce03027d080f7c3b9e SHA512 dde4ce13526bbb6399c4ba251fe609eed53975e83b54c167d3a18e76bd612a33a59005bfc032d753c36eb433c78eabb6031c8013a93d8cd8735132e4de1bcb68
-AUX docker-compose-1.23.0-setup-py.patch 1804 BLAKE2B b376b8d6381e978a60674c6894562858c97eef6434a4b0a17d2239fd0090df789ed3049e2f0d6b2c38d7ae502ea6aa22ae0506fd0c54cc459024ed80c49e3007 SHA512 6ca387d462c7d6eb0727638354ef25973a4a3fcbad0d74656c62a91ec50edd29a254121a060381f514efef0c259ba321cacd1adb0cafda26c550384178f46465
+AUX docker-compose-1.23.2-setup-py.patch 1755 BLAKE2B dca3f8d1f27e7aa147615f0fe8d1914553a6ce3665d5a6f9b5fb97a33a101b2aaedf6575b7214c7d977a7e44eb7ecfc3f572a0caaf23c53a25e7598444c77ee6 SHA512 bc19659766af5b0a3b0e846e537104ab6c1aad58fe42d82e39961ddbf82df3267bd5ec53548abd57a3c349c348f1937400ef4f0a552bb0bc9254f4aae9d77fac
+AUX docker-compose-1.24.0-setup-py.patch 1767 BLAKE2B 14ad1ab45fc11006a6054e4b5774990ba199344fc233f55b6ad034cf5fdce47cef96b15466c9b04cf33633a1cd34074db597b38b85d443499ff5264afc878a61 SHA512 1bd028ec272a8758ecec351590046919172a73d63b61643737438cda445f35caa2f85afed0b3ebe2c9092f5c7b1a84b1f340f661e4fcfa80301ef5d70f25e8bf
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66 SHA512 baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
+DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86
+EBUILD docker-compose-1.23.2-r1.ebuild 2151 BLAKE2B 3772d0d4453540e899812123d9e8b8c3b417b93664bdf537fccc715f8abfef02e0959b568d640877d9c3f0bd67c64a5326c76c1eb2482312dffacfad5745d529 SHA512 2fe376d2ddbb94ec3433c5416ce35c66fea6d2d04ed4e64320b6d0740086fa389dcdca8bbcb7e769e8afd8532cf072a44a8523766ed16bd98fd6d6dcdc3fbdd2
 EBUILD docker-compose-1.23.2.ebuild 2345 BLAKE2B 689c22833b36aadfb5e2dbea83cc1e3d1b3ae3979b5cf1553032f4caf72d11994b0761a97948b1ec8e162c4c83a8d56d628bfe6f3c6e7e845d8c54eb36a37d48 SHA512 b6d4e9906eb2ad7a08f3a0331a63369517e207ec382acd9a11e2131618cee2d9e854762f4d5c09e851e938d083af91ad7ef0b9cdf9a93453a073acffb92dfe07
-MISC metadata.xml 324 BLAKE2B 3ce39fdfe98f2c15cb17f46998dcf6a48a87368d0d71563ccd3325e305f88778531dcf21d0cbd335b1a9fc0e780d0ebcc5b51100b95a82223ee5436569753a8e SHA512 d8d5f8f462a459745a4b8a540b0fd648687b442df46c5f50413fa81df2a7d78ad27e7a615e2a77b96f5880840a942a69c350a375ed6ad4ea3a1f3fb4eb3ca7df
+EBUILD docker-compose-1.24.0.ebuild 2190 BLAKE2B 9530c00eb7db357d3acba879ff702377841cd5ecb01c34e20fec09f460a914943708cfcc8e60a7ecacfd1fef98f6f1a124ce7a1aafd6179a3965b6509c3d752d SHA512 da157b3c2b733a214b328f45321ad39def57666ca7d974a2188b963f0fb854c63a932a80e451f6a073f433eb690dd8214640a3b41d2e1f6633f4faf9728bf4b6
+MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
new file mode 100644
index 000000000000..df1a0e87a651
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.23.2-setup-py.patch
+)
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
new file mode 100644
index 000000000000..1efb5d463ed5
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.24.0-setup-py.patch
+)
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
index c95c776b2c38..193ece1c09f9 100644
--- a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
@@ -1,14 +1,14 @@
-From c481f53ff75d015b4db37b294c5a2142d0272f32 Mon Sep 17 00:00:00 2001
+From 15b1ac5bfeb0ca2a8524dae10db7573b4efacba9 Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 31 Oct 2018 18:45:59 +0100
+Date: Fri, 10 May 2019 23:54:14 +0200
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
+ setup.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 8260ebc..7f76abb 100644
+index 22dafdb..00167ce 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,16 +30,16 @@ def find_version(*file_paths):
@@ -21,7 +21,7 @@ index 8260ebc..7f76abb 100644
 -    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
 -    'texttable >= 0.9.0, < 0.10',
 -    'websocket-client >= 0.32.0, < 1.0',
--    'docker >= 3.5.0, < 4.0',
+-    'docker >= 3.6.0, < 4.0',
 -    'dockerpty >= 0.4.1, < 0.5',
 -    'six >= 1.3.0, < 2',
 -    'jsonschema >= 2.5.1, < 3',
@@ -31,7 +31,7 @@ index 8260ebc..7f76abb 100644
 +    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
-+    'docker >= 3.5.0',
++    'docker >= 3.6.0',
 +    'dockerpty >= 0.4.1',
 +    'six >= 1.3.0',
 +    'jsonschema >= 2.5.1',
@@ -45,15 +45,14 @@ index 8260ebc..7f76abb 100644
 -    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 +    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
      ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
--    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
+     ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
 -    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
 -    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':python_version < "3.3"': ['ipaddress'],
 +    ':sys_platform == "win32"': ['colorama >= 0.4'],
 +    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
  }
  
  
 -- 
-2.19.1
+2.21.0
 
diff --git a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
index 191e96d63961..1632a018bd41 100644
--- a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
@@ -1,14 +1,14 @@
-From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
+From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 24 Sep 2018 17:35:22 +0200
+Date: Sat, 11 May 2019 00:32:22 +0200
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 24 +++++++++++++-------------
+ setup.py | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e0a26b0..1f9fb7f 100644
+index 8371cc7..b9e5a80 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,16 +30,16 @@ def find_version(*file_paths):
@@ -17,11 +17,11 @@ index e0a26b0..1f9fb7f 100644
  install_requires = [
 -    'cached-property >= 1.2.0, < 2',
 -    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
--    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
+-    'PyYAML >= 3.10, < 4.3',
+-    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
 -    'texttable >= 0.9.0, < 0.10',
 -    'websocket-client >= 0.32.0, < 1.0',
--    'docker >= 3.4.1, < 4.0',
+-    'docker[ssh] >= 3.7.0, < 4.0',
 -    'dockerpty >= 0.4.1, < 0.5',
 -    'six >= 1.3.0, < 2',
 -    'jsonschema >= 2.5.1, < 3',
@@ -31,7 +31,7 @@ index e0a26b0..1f9fb7f 100644
 +    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
-+    'docker >= 3.4.1',
++    'docker[ssh] >= 3.7.0',
 +    'dockerpty >= 0.4.1',
 +    'six >= 1.3.0',
 +    'jsonschema >= 2.5.1',
@@ -46,13 +46,13 @@ index e0a26b0..1f9fb7f 100644
 +    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
      ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
      ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--    ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
 -    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':sys_platform == "win32"': ['colorama >= 0.3.9'],
++    ':sys_platform == "win32"': ['colorama >= 0.4'],
 +    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
  }
  
  
 -- 
-2.19.0.rc2
+2.21.0
 
diff --git a/app-emulation/docker-compose/metadata.xml b/app-emulation/docker-compose/metadata.xml
index 5098f7be1a77..e8aeb1e23f1e 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">docker-compose</remote-id>
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 901b846b7ce6..9430fffffa37 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -4,11 +4,13 @@ DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B ad1fc76347058610e2cd165
 DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3 SHA512 9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
 DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f SHA512 8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
 DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4 SHA512 a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2
+DIST docker-proxy-0.8.0_p20190417.tar.gz 2705315 BLAKE2B 13d2b9caeaf0d2d16dc8cda641e9b13d12bc7c9dcdcf9caa60fb80c2bba9b4c9a15c8c959fdce019367002d58d83859145d70b78431b5fe7e9322d3b127cd0df SHA512 c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e
 EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3
 EBUILD docker-proxy-0.8.0_p20180626.ebuild 825 BLAKE2B 256ce2df79ece0668908db8d64ddfdb6737ce6d1ba7ef6e7a8a4b8c16af057d7ae81b75b3b3e9a6b93adb2f874f7563839f6bd343c00c88ac0ea4ff0bc5e5bbc SHA512 e211a3ac5576960377b5de1b164b5238243a215a50a76358aae240d221c160d013f85304909cdaec1db9719ab92bfce03b1afa71aeb9fae2930fc844438ffc46
 EBUILD docker-proxy-0.8.0_p20180907.ebuild 826 BLAKE2B 19c2f5cc5094a1f47b2bb97df327902c3173f161f71e55540be7a2b60574567bed7e1739913f0331c120b4e6e66c791f8e79dea7e020a9523dad5882cac85134 SHA512 226a6faa9ac793eb9144741bb4853ec14d0f86df61c56a3610df7439b9f693ae3024c4b5f749378ce24b79789f0efeb181726057ed86f1206f7b0085e469260b
 EBUILD docker-proxy-0.8.0_p20181207.ebuild 825 BLAKE2B ae4d246ed05a3cf8b8ed9d41955cb9edc9d9d530113ed16ceb4f44c02b00ac3e9a59a52f7b6862c584da28e8e2fccbaf6ea5000d27f87891c6669789a575df1d SHA512 2cf5e7df32c7aadf606f53a54ce58188f32801da8f0003656120762a6ad4b9fe6e58e6648cf2a37d0c131ee2a2ae6aee1ebbca07ba556f645d2915afadbfd35a
 EBUILD docker-proxy-0.8.0_p20190301.ebuild 825 BLAKE2B 0bf7dbe59a67bfda70b0a0c01a411de64bef45cad0d24ac53f2e78206ca4b2fdd857651da83f8f220d1e2133a62f2edf8481869bc7a40aced2da55df595b8c90 SHA512 26e47320a89a510736bae74e70c479bd6da84b8d9f85007e350e9ba383ac55a5e5d753d8a0b8a4e73bcadffb2863de3511e9810f0586a50081ddceda3f1ea795
 EBUILD docker-proxy-0.8.0_p20190405.ebuild 780 BLAKE2B 66e2065030aa221fe643d1c92ff93a371193b9bf8079248aaa387aa8d98cf0ceedbdf01eec1bbe81d2f04e939fb8289287eb5961383e883fa4c5043dd85d179b SHA512 19c88c7e750d8d0f7bd73b85a0edf674e9ba17bdc5421db16166a3bdc1dce1cd17a9be65b0db0b3e7b58a026527e6eb0893c1cbd983f15ee0cee86ae1e3d06ec
+EBUILD docker-proxy-0.8.0_p20190417.ebuild 781 BLAKE2B 97d4860a524967f5b85e10a9b49276b04e473a1b93535e411a2503aea381ad14e22913d7d7fb71dd1d105e42d2287bea5078d29f9f082f4c99bb403dbf4d634a SHA512 26a5dc864307eb97c571f1b4568c398837e2e25d7f05c581987d5ef7993415a12bc6b7ca7ab8c223f514fb79d82e34ba45633e3def02e2ad191d502eb8bfcff7
 EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
new file mode 100644
index 000000000000..f87e25fa0791
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="872f0a83c98add6cae255c8859e29532febc0039"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc ROADMAP.md README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index ab4380365aed..98d06bdc4f0f 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,5 @@
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73 SHA512 a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
+DIST docker-18.09.6.tar.gz 15257416 BLAKE2B e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d SHA512 f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28
 EBUILD docker-18.09.5.ebuild 8295 BLAKE2B 709070fb9b1580761330222171e50876189317102b27ea421fd5eca1a78ef8006c42798d436fba958fde8a75c2ef9210c5262229cf4ba6f8417dfccba9626b8b SHA512 2f4e312aa21eac3057d33ce01067997283a24ef87d24c9d2b3da7eeb55d4cbc7732b3d2f21076cc6881e3fa92f5113d9875e05b99f073ebbcee16efaaff63202
+EBUILD docker-18.09.6.ebuild 8296 BLAKE2B 30fccc51f052ccb11e61a7484e90fd8e56e726469fe5e9b01c0b74a6b713e45a9429949d5bdc6c1c08bb706e5a2e5c5dcc44548a70ee0e7a33ae3aa7d76606c5 SHA512 0f488a12b5ae102b195a907f0ab67ed7abc906e93f65384be0cb54d001a998c381212f489f260c83ca7c749ab8b936012232bcbe986b7ccb915db1325eb5d58f
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-18.09.6.ebuild b/app-emulation/docker/docker-18.09.6.ebuild
new file mode 100644
index 000000000000..9e222ed54de2
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.6.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="481bc77"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.5
+	~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20190417
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index ac060cf5d932..f07b50af4a21 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,4 +1,5 @@
 AUX fs-uae-launcher-2.8.3-German-ROMs.patch 747 BLAKE2B a7235e3c55a0e6a365b252e5b856f5a609a8aa938cf114d5717c71d69fb4ac280d1a652f74c5a21088dca44473dd749a6e3955dac453dc8c38396054a90899b5 SHA512 9c757f68f0ed74540affe88af4b061009167c0207b346d77cccef1e3a7184b0cb2112eb2ca1547e04a245a9ccf156f9d55031a35d23ef56312cf283473ff8f26
+AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
 DIST fs-uae-launcher-2.8.3.tar.gz 8784242 BLAKE2B e54f73efde6563d9e4ab6b4f57cc73bca80d72d0ded4db67edc53dc344685889abf485df067541e8d635595ac5457ec456ded0306310b1ad95a3b3ef07e53bc3 SHA512 4eaa5979fe2e8f2c792d4878e9a9ad0a0433206aac42aa380d97aee21e4ba29a54caced2437b83357c2c4d2fab121bfb821fdb8a883ead971766866b02067a2d
-EBUILD fs-uae-launcher-2.8.3.ebuild 2019 BLAKE2B 95a288de45f5cc2c7d38c4919496223196bfba8d7834ebb00120010b460b12a2eba8ddfee797651c93b03ea3e78df70612973f129e4ed23a2c1c568a06932108 SHA512 222e1ad2b5d47211f551e73c7a827ca1ddd86e5aa5265541de1aaa938e4cd970beb76af7e66cf1a47d5b2dc5050420ecd72b7ef8e2c80ff41997961147f95f34
+EBUILD fs-uae-launcher-2.8.3-r1.ebuild 2093 BLAKE2B 127c7f61cb14207ff917dea6f10ad8c469ab995e853d6fe81dfdbd9212612afcb34d83e87f971513c40f8813755eb8f26c510a2bdaf7c0338a9caf6af704aadc SHA512 32818439bd446f8e2d1b28b66c5c33c963fb7e542a6a4bb435807726b1023a9def2af1d9fd70f6e64fbc34f58207c950d46981ffc5184346a3495d4ec555b0e1
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-QApplication.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-QApplication.patch
new file mode 100644
index 000000000000..446bfd835912
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-QApplication.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/684948
+
+--- fs-uae-launcher-2.8.3/fsui/qt/qt.py	2017-01-08 19:48:56.000000000 +0000
++++ fs-uae-launcher-2.8.3/fsui/qt/qt.py	2019-05-03 22:28:16.979041988 +0100
+@@ -60,7 +60,7 @@
+     # fix_qt_for_maverick()
+ 
+     fsbc.desktop.set_open_url_in_browser_function(open_url_in_browser)
+-    qapplication = QtBaseApplication([])
++    qapplication = QtBaseApplication([''])
+     initialize_qt_style(qapplication)
+     return qapplication
+ 
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild
index 8a1bab4b4578..ea3355abae22 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="lha"
 RDEPEND="
 	app-emulation/fs-uae
 	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
 	dev-python/six[${PYTHON_USEDEP}]
 	lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
 "
@@ -30,6 +30,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-German-ROMs.patch
+	"${FILESDIR}"/${P}-QApplication.patch
 )
 
 src_prepare() {
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index bdfc1b099dc8..19b3ed137cfb 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -4,10 +4,12 @@ DIST img-0.5.1.tar.gz 6394095 BLAKE2B 5c26487f721ef7157c8dc47c5abc2f4f296efe4ddf
 DIST img-0.5.2.tar.gz 3426613 BLAKE2B 75da804bee0960c195f3f5af6f10276d3d9a93dfcf08c784b831da2dd4e27714f0c8c24b24d2683b1b75276362b47a2bbc251e032b5b1b87c081922cee4f90f4 SHA512 cbae3fab61005238c939ad5fa5b785b07ee10f964a686962bdaec7170297840ebda188b93a1e3b89c6041db455a085d537005f8b1dc8753cd4e77f3e699f40e4
 DIST img-0.5.4.tar.gz 3429272 BLAKE2B 3426dc6503693ad00c4c9f13c3813a6cf71826987aa2bb8351f695ffebed78fd79383b548040ef880b55984852f32fcb33ae5f1d1dcc4f9f6250498fbd64ebf0 SHA512 db51862aff5e0bb7280f17597f8d7231dd9aa741126b41c0af922b1f136d2ac4e0f08e51ab583ed098b194b58df29808c42cfd5381a217113f6b4bbf0dad06c8
 DIST img-0.5.6.tar.gz 3429213 BLAKE2B a1525d4aa09e11d122b41b54da8b90557dac3d0bfed5ea93dd6dad31269b7095d58d6d44dcd92dad9d56436132493d7ec8f1517b32eaa2bfb608bfb1fef639ec SHA512 e1a4469717df66f167f859cbf82ce54dd877e3e9c2f2d723f4424480c0429ac6ad99a13718c103bed3a823a91bef2f3ee3ac6c17e6f951f74f2f1b3ed0021785
+DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
 EBUILD img-0.4.8.ebuild 921 BLAKE2B 050b449fa9c34e4171573810ccb204ae2eba7e0ad9a50da5e3c0673f0b9c74b81e611d9a6e07506b560e4570fc2ee5ffc7455d95ba071ab6e23aef9abdf413cf SHA512 9871ad935ed3382eddc90a3955ce68462a6e34a0f8c4299fec30ff0791924c7bd6ab75e02767afd36a2283aa705636d7c28683fea53b1ecc19352319ac0792a1
 EBUILD img-0.4.9.ebuild 921 BLAKE2B 43a0c49430a0b1c4696cbe41353fa53a2d2bbe6f0de7602d2338c48a1a86335c1cfdb548b569829bcb51591adc626c9088937cb7121d61a2de79ed775d9c48ca SHA512 14ece586610cc8b76a42b39c79b2f41bd36d8f80d10398ae3f147fda6d512276eb5bc8aba6700c122f34b28426be6dabee2048a634f29b62657b287fdc145c92
 EBUILD img-0.5.1.ebuild 918 BLAKE2B e79cd947781d1779f954a07a414bf5412fb84ae273a196aa21f12b26aa029d083f029657c6e2adb21d80267181f31ec84ef5b861526c338a260ed1c556a55013 SHA512 e93d152e84429e3044c760264e61fc8210f0f7f45c9322ede18266f88fb4f9539631aa1999ef9e3a73afae90819b769939a802c772c3d1233187d87edc821ee8
 EBUILD img-0.5.2.ebuild 918 BLAKE2B 9e982b5fb1fda4aa0c85ecd066499329848d2308b0b621d718319c9bf6fb09bbe5154afedcfa91cb7b30102590f4b96a01d588ae4e56ba03460366490dc2e25a SHA512 c01b3768cc67cb5f2263f06fe1f4c64b6194370367e642cc5463777c30c89faa2962fdb7077b476d2a8256b2807e3ce3a73180ea267564da6b3b64eb72e4cd7b
 EBUILD img-0.5.4.ebuild 918 BLAKE2B 406e7afcc01bd601aceea21dae8170989474c534100ff24dcb2270b53857a6c12f0415867ccbc0186aa8f801df6649b23467ce6517ef568b04eff9370faaaf1f SHA512 791fe47bdd4397cd5218aa47fa4f6eb8c7ccf60a70834d23a3164e8b04cefdfb60bcf48718b478a5c2dab3409f69d87a8140418e473506cfc19357e728ff049f
 EBUILD img-0.5.6.ebuild 918 BLAKE2B 4585d6c42446ba7c649791d5d4fdfd3c916457b26e40827d785900384f74ec5d888422e752538a195070858692405173f5f7cbe932cacd30087c8c7939fabf70 SHA512 fbd4cfd7778ea358f7ce43305bb52a9213269b7307e005cc0cbd053ce081087e1924069f001b105c163f87ed3caa1ecfe442980c965f4fd0a4895a51687796d4
+EBUILD img-0.5.7.ebuild 889 BLAKE2B 50e79b991e0398aa79085dee21ab1d37e7c4e46d7a77794d88080de7d67e1101e1e8f0a1a5f0ea88492afc4f91416077e382345bbbabde8f16bfc00480f08d29 SHA512 d1ca0e8d9a670a16389d3e06683a6ca3873a8761ef29b317496e45d1461ec6bf624a79561caca39e79b4d9c325f2ef5164f7b9cc576a6bfe89bd6613bc2bf96b
 MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
diff --git a/app-emulation/img/img-0.5.7.ebuild b/app-emulation/img/img-0.5.7.ebuild
new file mode 100644
index 000000000000..a83d24d7c281
--- /dev/null
+++ b/app-emulation/img/img-0.5.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/img"
+GIT_COMMIT="d14bb92b69804443263d647647b0833013b8df91"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+RESTRICT="test"
+
+src_compile() {
+	local TAGS=$(usex seccomp 'seccomp' '')
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 6d4cdaf1eafe..d93eee925ecc 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -10,6 +10,7 @@ AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c4
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91
 AUX libvirtd.init-r16 1093 BLAKE2B 7242ddcc7046392e8c24c1918a1dce343a3198fd80346c97850bb0226888d98f6d57f53eb00e38b8f9e71fd2073feef8399b340aea9ab9d8ed64a646140c3dc1 SHA512 5ea4c2f9e48faf2aa8fe7077d075841d610da17e28bcc85c79c55565f286e345339f042090b453e25accf5c405e322e76b6cf846fdfb3e90db3e2d0c2fff4c48
+AUX libvirtd.init-r17 1153 BLAKE2B b7f775a5bd6a2532da50fecc272036176e1b82db1c3de7e817fa9ded29f351f621fde48a134bc31dc6b4145e55ca4c5906ab9d4b34ec0c45fb738b9908f1a733 SHA512 bd81ff66c6dbaa451627c2e5b17c4428cf6f5cf81ccbf29697060c59a68dbcf75ebd0d8806d0f5af7a79bf32090fadc90af76826d177861a21049541f3832052
 AUX libvirtd.service.conf 401 BLAKE2B edd74238f9639ead1d776142e6231d87f39cb6670e72cec9c1ac44f58fcfbc63e72944d2d243a1aabe48b9acc6bb1c52189161a79e3d42603c87a270027c42f8 SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32
 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
@@ -21,6 +22,7 @@ DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2f
 EBUILD libvirt-4.9.0.ebuild 9673 BLAKE2B 3ba41380b45f9a4d2b0fdc3826a3af61004213e6acaa7ab0afd2644217bbd984245789e3aeefdb5efcdd77cf5a7389d5b68b13fbd025e8a6518fcba0bddb0611 SHA512 3888b75c3ce8a1049cd2fe14bde03885e5b260a85792f898baf47943546e5d788e281b4cd6163e5bb0336608583e6ea01f29841e4aa8e5689714be45c2747906
 EBUILD libvirt-5.0.0-r1.ebuild 9897 BLAKE2B 8e562642eefa5ee6a13dc1aeb1c2f6a84692633d0023e9735b1e3cc2aaa803ea68b56694225f04d145315f5587533e34a9009fe9875307db9d3123d5b086dcf1 SHA512 158d97f7e8465094f303b9cac0fe8b7ce09af8619c1e049695bbafd7ad745382646490a041e78baab92b8db0ba10298acbbf58d2890a6fafcb2902808085a387
 EBUILD libvirt-5.1.0-r1.ebuild 9903 BLAKE2B dc8dc7dbfd7ae46d3b449bbcc69a9739333e2714d0bf7f6a89b1c8a93b625ef1bd53ab7ffc5d1f0d5ef7a6a9619f7bc7e5625d9a41006c40e7d0a38023ba46c8 SHA512 70ca917fd8925bf81cd1383996ff704997c8ef13dba7dd7c4b7fba90c6a57255b55f0143f90f51305607a0d964c0216907e7121d92c6d8e88120b49643c20139
+EBUILD libvirt-5.2.0-r1.ebuild 9903 BLAKE2B bc6d1e56e6845e8f75d1aa6af160a45ddd1e3434f1ca2e2766a535ec96a3f76ec86f5058a5f13bd146b4b5a184dec2feb6fb333fbd246743b92abd23580020e9 SHA512 0b00e5ccb7841e20670c3e0eeb1077d265aeb383444519214614a3bf7a416209013eb0946f6804cb6b39542c8d687513037df6c4d5c99a2a59ccf8be4246be45
 EBUILD libvirt-5.2.0.ebuild 9903 BLAKE2B 4609c1ec8d3c51b940e200afb5ce9cfe8dcdf0676d2875f65fb8644de0db6c2cc0fb0c2c833241f0a0dc9cd11d2872c3bc14143cf7cc56639e0bca145db04fd1 SHA512 9f3e0e77bbc35be79f99cf9bafaa74d3e314022315ef9c51ddff4120363468f0f651e56fd659f4d9e0358c9d237626720da54a5dd094cebe402c7d0332faded8
 EBUILD libvirt-9999.ebuild 9903 BLAKE2B 4609c1ec8d3c51b940e200afb5ce9cfe8dcdf0676d2875f65fb8644de0db6c2cc0fb0c2c833241f0a0dc9cd11d2872c3bc14143cf7cc56639e0bca145db04fd1 SHA512 9f3e0e77bbc35be79f99cf9bafaa74d3e314022315ef9c51ddff4120363468f0f651e56fd659f4d9e0358c9d237626720da54a5dd094cebe402c7d0332faded8
 MISC metadata.xml 3857 BLAKE2B bc5dc60897ca70f3a586c947784dec74cf7daa35909836955dc52a442668b08323398473f9df8be46f2819e762638dcfcb646a8fb7ee768210f27584fb91e3f6 SHA512 33274100068f99fe0c69546e81fb47517818adf2991529533b9bacfc6bcb23ee08ae00b9d0a7a7ff47cb920d2ff1e24b5fc788a3533a89ff477ab04dad0194fc
diff --git a/app-emulation/libvirt/files/libvirtd.init-r17 b/app-emulation/libvirt/files/libvirtd.init-r17
new file mode 100644
index 000000000000..ca3f872e14e0
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init-r17
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Virtual Machine Management daemon (libvirt)"
+
+LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
+LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+
+command="/usr/sbin/libvirtd"
+command_args="-d ${LIBVIRTD_OPTS}"
+start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
+pidfile="/var/run/libvirtd.pid"
+retry="${LIBVIRTD_TERMTIMEOUT}"
+
+depend() {
+	need virtlogd
+	use dbus virtlockd
+	after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
+	USE_FLAG_FIREWALLD
+	USE_FLAG_AVAHI
+	USE_FLAG_ISCSI
+	USE_FLAG_RBD
+}
+
+start_pre() {
+	# Test configuration directories in /etc/libvirt/ to be either not
+	# present or a directory, i.e. not a regular file, bug #532892
+
+	checkpath --directory /etc/libvirt/lxc || return 1
+	checkpath --directory /etc/libvirt/nwfilter || return 1
+	[ -L /etc/libvirt/qemu ] ||
+		checkpath --directory /etc/libvirt/qemu || return 1
+	[ -L /etc/libvirt/storage ] ||
+		checkpath --directory /etc/libvirt/storage || return 1
+}
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..78ac8a38d3dc
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-5.2.0-r1.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
+	wireshark-plugins xen zeroconf zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-1.5.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+		    git submodule status .gnulib | awk '{ print $1 }'
+		    git hash-object bootstrap.conf
+		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zeroconf avahi)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--with-html-subdir=${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	newbashcomp "${S}/tools/bash-completion/vsh" virsh
+	bashcomp_alias virsh virt-admin
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 03260ef04155..3a62eb9160b9 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,3 +1,5 @@
 DIST punes-0.103.tar.gz 5366838 BLAKE2B cb4a9a1336293891e06d573f68c52962e79220e7024fad716a957f5423a72703a34efc3fb6129dbe9ffde2c96fe7abd2a1ad4a622aaca89e90f6a2d5af8c1a53 SHA512 db0fbc075b9fd46be8013b17c03fd7abd12b209ce166557c83283c917e53224712ba5838cd8b9e7fad3d21271f29e475460996dd9800b9f759602e289bad4205
+DIST punes-0.104.tar.gz 5381182 BLAKE2B fefa6eb85e9cfe5eb10fd987061e6f708a2d29db374552ca217e1e47bfd3a982390d2fdf33f23407bb54d7e1a3491e33cc2c520ff3ead4566f687c6c652bcc6a SHA512 9636440cf66cb9f48b532cebff4342a775ddacffd98748e5669d820e213a648cbfb3e4e94f67389f21f88b4fa618bf514e31738c10df079abe22d4b19593d904
 EBUILD punes-0.103.ebuild 967 BLAKE2B 544a6b435b37df81d70cb910306166b9ed8abea34affe35907df7eef299a5afe1d555807badadc5fee5d096c466a46593641b8a6e24e37e9ed086a3d677a7102 SHA512 da0c115bfb8d7d138054e7e5b2cbc29449ff9ed6f63c4ea000fd630ebb87e1e72ccee7e637cc4a741aedc2ebdf68f1e799d58afc9530d3384e9d57948d7a8824
+EBUILD punes-0.104.ebuild 967 BLAKE2B 225fb2763ad92dee3da274b30396bd2a6759666c91689b5cd9f2a88c3097ccd410f24b3ca77437d4541dc57216b7aeaad42a0b7293abde5c5c463fce4d3dbac7 SHA512 40d1905cc954f63040b61dbe33c2864e8ef35c71cd800a39e1edbbb6a50fb09ce022bd876d8496365174e34ac62ab42a2321dfaba21b1feb0f600f1feba02779
 MISC metadata.xml 625 BLAKE2B 3ae9de8ff12a46dd98f0132843cf2fe0f7be77d33497fc2a97b026adba711f2bafd04f71140bf4cddaf6242dc4a9b85ea26f8ec905f0325041dc10b0afa85e4b SHA512 d93f23a57d82c716a4b25526ba184ab135fdd81de106e90b7ba2589607d42f16c28b326e257345f34a85f7cda09cd90cda4dc6989b02b46de6350e343c71c2f6
diff --git a/app-emulation/punes/punes-0.104.ebuild b/app-emulation/punes/punes-0.104.ebuild
new file mode 100644
index 000000000000..ae456a0a5a28
--- /dev/null
+++ b/app-emulation/punes/punes-0.104.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="Nintendo Entertainment System (NES) emulator"
+HOMEPAGE="https://github.com/punesemu/puNES"
+SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	media-libs/alsa-lib
+	virtual/opengl"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/puNES-${PV}"
+
+src_prepare() {
+	default
+
+	sed -i "/update-desktop-database/d" misc/Makefile.am || die
+	eautoreconf
+	# FIXME why eautoreconf can't handle this?
+	cd "src/extra/lib7zip-1.6.5" || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with cg opengl-nvidia-cg)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a4b407d8075f..0566dbfdaff5 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,6 +3,7 @@ AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b836765
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
 AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf103faadb5dd42daf36ad1c5e39c5bdfdc2b5f2bb0bfec2ea1255b4182caeb467614a487f5cfcb341109a4884 SHA512 0194d28de08b4e51c5bd1c9a2cc7965ba7f66dfddb8fd91de3da93677e6cf2d38ad3270f69aaea8a20cf2533c2980018d6e0fed711be2806fe2053fba7c081f3
 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0
+AUX qemu-3.1.0-md-clear-md-no.patch 2690 BLAKE2B fcf6b7599985da60dcdf873e27c832075cd9c766d10ab3784c0f935965276b8c520005a62fc884a35c78942ce225bbd9a67083ef058e03f1a7c0963b816ae7b4 SHA512 bb452d110353bae4878ec030ef5f2f05c73294cbe08e8fc18267f23f922117e7e295302ac65df8008b5db3ff72bcff2e3eefd2da8b9a53868daea321d10958c1
 AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
@@ -10,6 +11,6 @@ DIST qemu-3.1.0-patches-r1.tar.xz 2292 BLAKE2B 0861dcf2eebd7f1f6dd495035fc39a14e
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 EBUILD qemu-3.1.0-r4.ebuild 23873 BLAKE2B a16ea397f5da2d3e36edaee9d584fe99366e2b85afe21d83eb906aac58c946ba85789c3430fab4913b8fd9008e2e13fcd13822bf643932988ac999e527311442 SHA512 158917bb98ac88f9d635e928b6397409051ea00269749751d5b0c5aa9d0bb539e7bb50573131e2eba0b6748ddee34a6ffd366c7aa180b2094553bb7b01193223
-EBUILD qemu-4.0.0.ebuild 23707 BLAKE2B b88519c5d0d2cf5e5e7875815ac837fe662a87bb3ad91848305df6e360d9e1b24d944105b857d5272d7d34edb9d94f7b7d24f410c2db57d8dc97e47c438fa525 SHA512 1d1b9772d83af975d79fc1a7f4b7316701883cd9bbeddcf1366f2ff7b82f90c007d0a4c11270242887d7a1aa2e21f801f62ee57b571a3b5ecc5b0c5259f3fb03
+EBUILD qemu-4.0.0-r2.ebuild 23755 BLAKE2B 70c3ec4c3591e2e33a7647c9ee25e9aafe3b5b9a07f6ea53627be19d3fcdd0fa1cd50c644ebc6914b10b52f4193c6db87369e39dfadd7ec1a19160465f22415c SHA512 3f142facc9f173eecf562fe3a47346705879243879b598a5301724104365aea75f571a8207d2d1321593038f1ceecb5029d59f7a4217ae22309fbd9ac2ac74c2
 EBUILD qemu-9999.ebuild 23660 BLAKE2B 861d8c176f233dad287abd6624fa50654f7cbbcc6da4803bbc5a23f5af876b843d6570ae857adefc25b603b8c48aed6a45eeafcf873fa7afb4d75a17d033b2d5 SHA512 34c5c6ddb4caef28f0613b3fe7ec4decfb98b54cc519f1cdf3d238dd2307b2005317a3bbd0304c39c894c3f35f0b6bb124aa2670e29b38b482de3df3c601ef44
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch b/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
new file mode 100644
index 000000000000..a7b3e8cb8f20
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
@@ -0,0 +1,61 @@
+From 0fb766134bd97ead71646e13349f93769e536ed9 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Fri, 17 May 2019 02:21:10 -0500
+Subject: [PATCH] Define md-clear bit, expose md-no CPUID
+
+Fixes for CVE-2018-121{26|27|30}, CVE-2019-11091
+
+See related fixes for Ubuntu:
+  https://launchpad.net/ubuntu/+source/qemu/1:3.1+dfsg-2ubuntu3.1
+---
+ target/i386/cpu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index d6bb57d2..331a364a 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -1076,7 +1076,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
+         .feat_names = {
+             NULL, NULL, "avx512-4vnniw", "avx512-4fmaps",
+             NULL, NULL, NULL, NULL,
+-            NULL, NULL, NULL, NULL,
++            NULL, NULL, "md-clear", NULL,
+             NULL, NULL, NULL, NULL,
+             NULL, NULL, NULL, NULL,
+             NULL, NULL, NULL, NULL,
+@@ -1183,7 +1183,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
+         .type = MSR_FEATURE_WORD,
+         .feat_names = {
+             "rdctl-no", "ibrs-all", "rsba", "skip-l1dfl-vmentry",
+-            "ssb-no", NULL, NULL, NULL,
++            "ssb-no", "mds-no", NULL, NULL,
+             NULL, NULL, NULL, NULL,
+             NULL, NULL, NULL, NULL,
+             NULL, NULL, NULL, NULL,
+diff --git a/target/i386/cpu.h b/target/i386/cpu.h
+index 83fb5225..d0bab4d7 100644
+--- a/target/i386/cpu.h
++++ b/target/i386/cpu.h
+@@ -694,6 +694,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
+ 
+ #define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2) /* AVX512 Neural Network Instructions */
+ #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */
++#define CPUID_7_0_EDX_MD_CLEAR      (1U << 10) /* Microarchitectural Data Clear */
+ #define CPUID_7_0_EDX_SPEC_CTRL     (1U << 26) /* Speculation Control */
+ #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)  /*Arch Capabilities*/
+ #define CPUID_7_0_EDX_SPEC_CTRL_SSBD  (1U << 31) /* Speculative Store Bypass Disable */
+diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
+index 4d957fe8..b453552f 100644
+--- a/target/i386/hvf/x86_cpuid.c
++++ b/target/i386/hvf/x86_cpuid.c
+@@ -90,7 +90,8 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
+             }
+ 
+             ecx &= CPUID_7_0_ECX_AVX512BMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ;
+-            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS;
++            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS | \
++                   CPUID_7_0_EDX_MD_CLEAR;
+         } else {
+             ebx = 0;
+             ecx = 0;
diff --git a/app-emulation/qemu/qemu-4.0.0.ebuild b/app-emulation/qemu/qemu-4.0.0-r2.ebuild
index 1880553a9742..338b4117ba2a 100644
--- a/app-emulation/qemu/qemu-4.0.0.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r2.ebuild
@@ -205,6 +205,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${P}-sanitize-interp_info.patch
+	"${FILESDIR}"/${PN}-3.1.0-md-clear-md-no.patch
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/spice-html5/Manifest b/app-emulation/spice-html5/Manifest
index 7d0f2bea7929..6127f360b451 100644
--- a/app-emulation/spice-html5/Manifest
+++ b/app-emulation/spice-html5/Manifest
@@ -1,3 +1,3 @@
 DIST spice-html5-spice-html5-0.2.1.tar.gz 486871 BLAKE2B 4b44ad772ab5abf13e8d3fe7c651169b340c8978f4163b9b679046efaa554f86d5919d154f16262ea28ddb512ac55ea7b6651ae63f64cf6b69033d8306191dc3 SHA512 c6e17aa465da1a0b882184bb19f2560f43fd3b345fdc00ec71774c7aec37c3453fd87b2448202011e217dda21b602d20dd4d552d49d9a52b64cb91aff092eff7
-EBUILD spice-html5-0.2.1.ebuild 586 BLAKE2B da1af87390524e9c1676c1bbf2d5a43cd97017cb8b89aee9daebcd4dc3066eb36d98589cffa97f3390fe319813df1caf88010069ac6bddd78a2bb6f58fcc7bd1 SHA512 b1f53e33acbf8507fe19cbd6325b9a91ca14103a6fe304e4288db3c9d2ec0fb6a340395cf0309be734a00977bf976fd2beb2a869037c1f66a462c89eba093b20
+EBUILD spice-html5-0.2.1.ebuild 584 BLAKE2B c966524f1c2707e9cbc5fe3946168dc1ed8c496f3d22478e398e49989ead642308cfe1ffe80f3fba8f4250d81069119611e77dc05044d2b92994e35da755a39b SHA512 ba40fccd01ad2dd12298101fff0ac4e963c6f27d34b137704d5eae38afb161e412057a3cf1b27226965c3373ebc1077867b2de607a56180c9995d9c925364c5d
 MISC metadata.xml 436 BLAKE2B ba9b5d8dd5d477fe7e33fb3559840cbe68c08b2034969d4bccbdcb93e4cb8b0dcced263f5e16fbae47899edb32c034d0271444dd23dbb9b4e6d22cb5c361aa0c SHA512 ac292d93a9b8b3beb239b6a1e91fc5d7440b7bf7318d91b8bc90a28722324852c4692e8fca1794fd66536b631e1df1f1682bad9cacd3d34276c25b5b023aaaaf
diff --git a/app-emulation/spice-html5/spice-html5-0.2.1.ebuild b/app-emulation/spice-html5/spice-html5-0.2.1.ebuild
index 96b0048f7bd7..f5632403f2a1 100644
--- a/app-emulation/spice-html5/spice-html5-0.2.1.ebuild
+++ b/app-emulation/spice-html5/spice-html5-0.2.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index dd48e3a8a027..04d24d23a06e 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -16,5 +16,5 @@ EBUILD virtualbox-guest-additions-5.2.22.ebuild 6043 BLAKE2B 1a50b4b4ba3b2ed7009
 EBUILD virtualbox-guest-additions-5.2.26.ebuild 6118 BLAKE2B 20f06b42279f7ab9bb60d2bdb26c7bede86ac1c64ed91ad42bb5ac0e9d484aa0da7901c34e9d663c64e4c4672802e9104eeb5009fead6b41c66b7ed6e2026d49 SHA512 341d5319d2f593ead1f258b480f19c9a1c5a85c8068134c24546828ec3b56ed825672593ede34d62286b048e5d1d19dd3d6923fc6e0fd9fabc03ddd1bc5f701a
 EBUILD virtualbox-guest-additions-5.2.28.ebuild 6120 BLAKE2B a51f969b41ac40a359d649b2793478e2366449ddb3ca78386c6a88ad1729cae20266773b88f90763ec66cdf06fbf0add5f33e0b2eb6ac97d616fa1a47519d7b2 SHA512 09394ee4fdb0c1c651d58f4d9cabbcc340d61af0a3c393df31acf9e252494b73ba179869d19326ae436aec52258e6d2c195d23ffb757a528b556c084d863ac12
 EBUILD virtualbox-guest-additions-6.0.4.ebuild 6172 BLAKE2B d4abf0e0ccf13ef40b886f02be9c2baac081aacd3d8dfdde9d8c71402ea130ddb6e342670da930efa5c719b950873ce4077d8e9e4b66fdd1d3c397ee3b4b6af1 SHA512 1eff74c0b77cb2559b33c5c8f286d9e29c3c04a2cb8a868424f9310c65b6331c01950365094d96a875209edca74ba96d8319f62409cf5f2690c79ef154895171
-EBUILD virtualbox-guest-additions-6.0.6.ebuild 6208 BLAKE2B 505e4454f3505de0d006e197773ec2e57aed29c910868a998a8c2340d6f71de3d9159a36f7b0bbe261949d7a4a7fe863f841658579ff17ac8b6e704a65994aa8 SHA512 8c3242d660911d5bd41861c290bdd778f7da0328846696f3ad229ec396cf87408e9bc69fde42fdf1036141e72f6d9b1186f49bad407ba8c225ce1e67004f8257
+EBUILD virtualbox-guest-additions-6.0.6.ebuild 6005 BLAKE2B abe32d5d102f191ae10da3101c2ee53e006a78ff4dacb7f2aad28256c6c5732b753422df88998817710d039f0b824b2c8f9a65fbcd094b6e0b8e3a7a81822eca SHA512 9a82cf85ba34f1eb48e4b0bbfe61e5cf73b3daf34240cc7fca9c115675c64c90ec78ae0769a6de8d6345c491cb60afb342fe853cfc03aa778c5cff6506141826
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild
index 5256fbb5d67c..8162053ffd78 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild
@@ -48,34 +48,31 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 
 S="${WORKDIR}/${MY_P}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
 
 pkg_setup() {
 	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
 
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
 }
 
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules.sh \
-		"${WORKDIR}/vbox-kmod.tar.gz" &>/dev/null || die
-	unpack ./vbox-kmod.tar.gz
-
+src_prepare() {
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}" || die
 	rm -r kBuild/bin tools || die
-}
 
-src_prepare() {
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+	eend
+	popd &>/dev/null || die
+
 	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
 	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
 	popd &>/dev/null || die
 
@@ -83,15 +80,6 @@ src_prepare() {
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
 
-	# stupid new header references...
-	local vboxheader mdir
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d340fd647f97..5c9fa6c5c5c2 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -21,5 +21,5 @@ EBUILD virtualbox-5.2.22.ebuild 13857 BLAKE2B 2b27ee756ccb7b3dc03228c236768d2c07
 EBUILD virtualbox-5.2.26.ebuild 13951 BLAKE2B 3df397589abd502e86e4a757905df7fc38f593521817a3fe5202fc5d82a1fad91b755d9295b9df0a68fd29ca0459c30e4c2d4ff8c1b71df42319f564d28da286 SHA512 9807666ae2ab3312903687c181b84f6a30d55eaf636794dafd2963c7d6e106802f8bfc245634f05765f2bf63f31131eb80332bb66b92c738427c980d506725c7
 EBUILD virtualbox-5.2.28-r1.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
 EBUILD virtualbox-6.0.4-r1.ebuild 14113 BLAKE2B 19564cf9439bdfc4839fec5a4594ff08fc2bfff5c854c89d1e76cdb1fa5cf84e7e85018796811cc36b86aa6825c5bf297a547d0cfd615fc535e410b0919fae85 SHA512 821359c4be22471ae0e6b0d68139dd80c55a6a0af864b66e3525a69d8e45b3a8b43f3df74602cff6b12fb9d57999c9184069e9d1f402e645033d65dcc7e1ef04
-EBUILD virtualbox-6.0.6-r1.ebuild 14562 BLAKE2B d61dddfa195178d32f76c4445d045335f40e6c382ee58904cf6eb9db924d7bd8eaf4944f5db4434192a668df58f7334972430ca61e7a0a3394449cb728028a5b SHA512 c606d0e15f57874f93e9c38665e61a110381e50eab5779a3beb9ecadcc8fb3fa6b28eaecbb11ba6a0a960f7fc193510b4b2f44166182652037b9bd2e1cd601dd
+EBUILD virtualbox-6.0.6-r1.ebuild 14526 BLAKE2B 0392162bb49c29ef4aef0d58d18b9c13d6b4a7b61e29713bec7a41c70b75eafb7ccb3bf275aae00fe52e4757b8fe8766dc22b9ea167289e879f427c1dcdc01f6 SHA512 44cfa72dad3378c0817f47c3d8c6714187f2838773cd0518cd11c2e6321383a0942675eac18df37ad5e61fe70e9d309470630f06084e2276f0da57945d75fa01
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild
index ac99dd66bda2..627195b1a4d6 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild
@@ -262,9 +262,7 @@ src_compile() {
 }
 
 src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
 
 	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
 
@@ -489,7 +487,7 @@ pkg_postinst() {
 		elog ""
 		elog "WARNING!"
 		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+	elif [[ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
 		elog ""
 		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
 		elog "or else USB in ${PN} won't work."
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 22b695ce6794..99a2d7629a5a 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -2,5 +2,5 @@ DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c9
 DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
 EBUILD vkd3d-1.1.ebuild 930 BLAKE2B e6dc54a6d4bd2f77be16a4590edd9c9f2f75880b895a50f54fb12e3dce2ead0f22d1f4fb81ef1b27786f37dc598eb8ff6f77d83c21225ecaf23ca2a61a88a8da SHA512 8e52ee4fb4991d2ed46b05899439a985f1b3111d1e3064115a5f40a721eb09d280fc23d65d84c15da6d1a2c5f592c3569f530499ae292fab4b894c5f797e8317
-EBUILD vkd3d-9999.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
+EBUILD vkd3d-9999.ebuild 952 BLAKE2B 7097aca3f562bfefab4343c085f557859196760e10e353605659df24d222a74498ec8c5023d68416361fe2044e1d5e127e26c362c238730bf638c6c7519b2f09 SHA512 69cedfd76c630264bdc9826d3b69ea22ce73a63eafabd261d2bd60cdd947f63b431b7b7c406a97be71dace84ca02b7a744abfb7f0897094d87ffa2ead7bf1cb3
 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
index adf1fb7481d8..7d104fca6c2c 100644
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit multilib-minimal
 
+AUTOTOOLS_AUTORECONF="1"
+
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 9b69090438c2..55ce4216204b 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -16,5 +16,5 @@ EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f79545
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-4.0.ebuild 21151 BLAKE2B ac9c30146bb7a60d5637d59012a7ebd275504c541c13d4f7bf336b9c45e4c66a1944f3dfdf4827b71179e2b8865a85265d769471e9f66f87e31d3484ceaa79ee SHA512 f3c10f0a9720b7f8f4dc3ff0ec63eb877618759942770daad51e4ac96812d964bf1ee2f81355c456191791bbf4fa38899f979ffef52bd31ae421d7e19976f3e6
 EBUILD wine-any-4.1.ebuild 21120 BLAKE2B c5938e3247808913ae91039d3a8c8697ad61f19f7752bc726159cda9363ad8388a4c5f3db51d0fcf2615a49c937a4e54e815a83f9b6e25efcf6a5b3901437e8f SHA512 30232e794eef9c6fa8121d0130ab5757bf0aeeecfadac44e7e4790da54ea06408272d25cb23ada429bc8995b8302aaf831b396d8bb4965e3bbbdd65a01a70b5b
-EBUILD wine-any-9999.ebuild 21113 BLAKE2B 0e8fb8e516d1f29fc48db7bdd07c1f537758932205f3dcd84706aa62a19b96f37e430e9a5067b9c5332cadceaab1ebd5ddd0838f5c27247382a4d6823f8d8cdf SHA512 aefaaa862eaa0efba8684e278c5e19d0590db8548706ce61d1afb85454194bae5c1390d3ad81f39d2143314c66de95d19fed2a839a16c2b54707a30c3f5a4e6e
+EBUILD wine-any-9999.ebuild 21176 BLAKE2B c731221fbe73257d7e2265b2ab0f695290e6db1fca7e190f2dfb4f9e249e31e79f933f01313587ee6ec8fa1d3561527fe0076ab0513e8934a6728cc93c12b301 SHA512 dfa9e6f8e1bb24c36038fc9151f3a703f20dae4db2a60180ba45419fd235155fd3834a465e9db24e1237c273ee6bc6fb1659af5c72492a74dafd3360d0397789
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index d5fcb8498973..30eb8fe231ff 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -476,6 +476,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 73c294f3c728..a410d1b63254 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -11,5 +11,5 @@ EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3
 EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-4.0.ebuild 18679 BLAKE2B c764f94c2c018d15f1ca63b2adccd7fc043782ddae604cc5ef0a50b69d3a77de0452a73c363f932d59b76680883e892743a03beaa9d1fa81dffdb75ffec4fade SHA512 ee370f32b52e47c99fe7248e064e9910cd6b98d11dd1c86d458644e1240c100e70e1cd4d3919e1101cf0a882ba906551e3771fd142cbfe4112a9896d417cccdf
 EBUILD wine-d3d9-4.1.ebuild 18641 BLAKE2B 66fe7823a307418a85a5f6bd1cf5adbdec4d9b64c381c0b16e89da56b40286e2ea427e83f1f03366263c93a03f7446144a94fd9427c9ed0329f9c27df429d712 SHA512 7e452bbf8f36298487dcda525ad5e2c8f0cfb2cfa6de9c0947764c2e4791f205c7e946f0216dde7a39f1c55a7acdf7344ac71ea56c5cdb92dcdf5cbf3374c23b
-EBUILD wine-d3d9-9999.ebuild 18641 BLAKE2B 66fe7823a307418a85a5f6bd1cf5adbdec4d9b64c381c0b16e89da56b40286e2ea427e83f1f03366263c93a03f7446144a94fd9427c9ed0329f9c27df429d712 SHA512 7e452bbf8f36298487dcda525ad5e2c8f0cfb2cfa6de9c0947764c2e4791f205c7e946f0216dde7a39f1c55a7acdf7344ac71ea56c5cdb92dcdf5cbf3374c23b
+EBUILD wine-d3d9-9999.ebuild 18704 BLAKE2B db8de0d3fcedc8987819dbd39227ad6f6af3430edd6d2edf078760ee1d2fb077439cf453cb589f19cb945c195fd094453fb55bebb5771dfad7c33896b4696685 SHA512 4044502d09b877f856b4687d5017bb2a5e0822bfe07518c5b33d82f2648a39478f8597b32e01748ffeb4cc1a6576e813a5eec73152088d6a5b6a5c241b1ed2d4
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index f9e7a4e47808..d19971156d89 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -420,6 +420,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 97b97ef26607..7c7a8e3cbb8a 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,24 +1,24 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST gentoo-wine-patches-20190316.tar.xz 58848 BLAKE2B 76e66749638589dd6d6eceb4b78690483d14353597a4e47fe9e5325d8bdb2bceff66040c110f63b8bae698bc5838c280c048ff7375ba2ed8cc387cbe0422c79a SHA512 de2cf844ae686144c3f95f0a360c7fa8a62185500758f994b5a65836798bdc3092138dcd9c36d0267a6fcfdc13585258d31b281244a97b45965f40e0f2b29eda
 DIST gentoo-wine-patches-20190430.tar.xz 58896 BLAKE2B 96c30ee48c4c50720abe8bb1d5a7c2e8ba0691dca3fd38b3807e2b2269236bccb3da18e59b4e35c2703cfb725300ee53c95e9ed584dd9e2c4184b31716b6b4c6 SHA512 52970b1e0673ae84e614db33536e9fa64bb6497a6f19c462f73ddf6b3239f38c9d59fe1c379cd67ef613c0660dcf84e2753e54647f01a8a1b2ee95ae4bb9f8d6
+DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-4.4.tar.xz 21805668 BLAKE2B cf973240a3f2a1ad1cac8690cdc5cd86be428220395d90bfe3b15567e6a2be0bb78e5828de3b77b617827122f5b0bb1dfeeef351102ca001722340ceaeb5625e SHA512 6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000bb60db2f302aad49622192077b45880d45ad33ba4d82bfe3403fb82a1e65159f1352b40933de
 DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
 DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
 DIST wine-4.7.tar.xz 21962632 BLAKE2B 2f90212c93fb089fafb0dd44189044b3875a52e3f6b5300a44893ac9760afb398330c293abbffca15cd9f9a6da72e97c2702c04525e02663186d723f1f322da7 SHA512 cb768528db510f81d464b9c1bb48847162baaa86ef00dc7a418afdce38aa51262d150c14b3362fb40c93cc2e3633fc02b2916167f21af8a708eb393da6ba9163
+DIST wine-4.8.tar.xz 22024100 BLAKE2B cf87407a5fca83660c866a17ebeec62a97404c1eeb1d7b34a0995510e04aec2fe0350b644870a3d4817177b002cf07e69cd6761593122c93c22bda50bb8aec0b SHA512 ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab
 DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
 DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-DIST wine-staging-4.4.tar.gz 9882230 BLAKE2B 705841e14abf3e3e65ae4b64ac2613f42f0e8caf32258ef6fc7e78b5410038c7cc766293488bb110e1f4c2c06d6b55b4cd3e59acea7e0f15c3bb6304e427f891 SHA512 4ddeddac2e2de9afd95ded71edb47f3eac15d1ca94254481e5369d6b69e401471b00ba16747621eb2d0f7d92c0558590f6efe89b3ea15012d9d3d45553d49196
 DIST wine-staging-4.5.tar.gz 9859696 BLAKE2B 3d6ea22659fe45fe6cbe0f292737d4238e9f32b307b1750debfcb628a72b1dfc8a486c644a78c2d0285a206d13644ecc3bd26a307e61f78cc118219bf3395ec6 SHA512 fda32b26de79bd3bbff6b1ab2249d7ff8adc7e8da2753271e8dae4f84bc71764ea6d1a887cc643e0ff70b217bd75fefebd3eb1bd4b6faace9a36399878998029
 DIST wine-staging-4.6.tar.gz 9937386 BLAKE2B 105f1e040b03835ea59100cde609ed005970ccdcc37ede775f13df73a50f19a8b192f17500e3658759eabe3dc0e529d0b658c218f7fd87cae72994806fd4dfe2 SHA512 4b44cbdeffc8042c22d485c3d440894287793652734b7a791269a2f45ea10ceb81ce8c8bd302c55f62b04c127344532772ce2078d99835d22afa0088e153a888
 DIST wine-staging-4.7.tar.gz 9944737 BLAKE2B ccbded3c39efc00cdedd3eee9d4cf21ccdb75fceeed2a953bef6f5ed642e665eb8c519e1717f1b152ee456e6c2fa3759369a7014940bf035dbc34e2188ffa894 SHA512 1d9040ea542d18d5d041179cede7e1db40fc638bdb4ffef70a257dc50310e9fd0f93e5aa222d2d90551783b5a5064b3919a19e9072f931a7ae89506c462fb3e6
+DIST wine-staging-4.8.tar.gz 9926681 BLAKE2B c5b5017c9675b3124f647d099755a997626a0c9f969a0d024473cb7cf52d2bb6b58f6ce427b86a13531d53b6172a3d3d62096926b6ffe013c9b15fc03ae11470 SHA512 f2e7fbe1ed0f77bd307185d0f7aa9e837e64f86ae98828db25e05c998ec07a9dd57dc9f3e6b093310c95ff2a517825d36420d7bd9fc9028d11bc29321ac3559e
 EBUILD wine-staging-3.20.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.21.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
-EBUILD wine-staging-4.4-r1.ebuild 20280 BLAKE2B bb9251fe89e9663b2301d60390af94452e518edb583493271531e765f78a03b6febc09a95fe53ef8c2dbd3a1f1448c0984603fbec24b3a975a820a564f9743cd SHA512 add579ceb72dfefa06d6664391a80cb7a1db98a54854e642d55ab1365d7420d63d3a9a4c599629f0c59aebe5378a44d20a4eea2b4eff7d2df4223ec78e1bccb6
-EBUILD wine-staging-4.4.ebuild 20129 BLAKE2B 207719d957ba660c7c71d77e87ac224fdb222e2a9498ce9d265c2092260c039b7140288802bdbbbebc2b44415fafaba5cd83b9e32858b8c5a039afe2a38150a8 SHA512 e550ac4fa02065c7dc47272839025152b3c5a55dbb41e5e0b8eb7939bcddde86c3b5fc8efff9b00d2ab1d96e226ee1b3bb329cdbe5c88d099256b33fa02a5e1f
 EBUILD wine-staging-4.5.ebuild 20280 BLAKE2B bb9251fe89e9663b2301d60390af94452e518edb583493271531e765f78a03b6febc09a95fe53ef8c2dbd3a1f1448c0984603fbec24b3a975a820a564f9743cd SHA512 add579ceb72dfefa06d6664391a80cb7a1db98a54854e642d55ab1365d7420d63d3a9a4c599629f0c59aebe5378a44d20a4eea2b4eff7d2df4223ec78e1bccb6
 EBUILD wine-staging-4.6-r1.ebuild 20280 BLAKE2B 8c5ee19d0ce0c081f2d3a4895f6c1dc546ffa987ae48051d6b0d0a9f86e7d4a2f16222a1c0ecbe0627663e22eeb66bfde33be425bf82e0bef9c50ec58bc84fb9 SHA512 0efbdb07fd637d36172872c8a8757553941b9c11718fae6fec0090e0b651e31dc1b86d79632831f6964719beebe3db77a047415cdb4e0afed8c794efaeb483e3
-EBUILD wine-staging-4.7-r1.ebuild 20274 BLAKE2B 3ca9a8c9459bb59bb2468933bdae9bf552fa508becc15f1c966a74591b3a2376122ab39f14c5d012b0d81319cc9ed273b6a446ad2a301187540b1df98892b7bb SHA512 7f17028dad9c7e140634a26e5f64a2dea9a95ca1b863b275d6804f8d4dd81faac87e3024b054085131a90964ae5b654fe5ad497ffba0b1323ed412a588a33779
-EBUILD wine-staging-9999.ebuild 20274 BLAKE2B 3ca9a8c9459bb59bb2468933bdae9bf552fa508becc15f1c966a74591b3a2376122ab39f14c5d012b0d81319cc9ed273b6a446ad2a301187540b1df98892b7bb SHA512 7f17028dad9c7e140634a26e5f64a2dea9a95ca1b863b275d6804f8d4dd81faac87e3024b054085131a90964ae5b654fe5ad497ffba0b1323ed412a588a33779
-MISC metadata.xml 3726 BLAKE2B 77d0abd355f8c85069f843cccaf16c0c0afe4ea4dc29f6d9111d7127685dfa9dd8e668b7413bac2a1aec2228da7880f72c601eb9f1525e8bc09bab330524863d SHA512 2b732c0519d7d01d0023457e8eb8aa05f06465f3479fa3093712c0ebe25ea103322e19be57cdea2c8df19da42fc29620a8989cfa77719f0f49b7aaa0bded073c
+EBUILD wine-staging-4.7-r1.ebuild 20337 BLAKE2B 008d5ad36dd73036675bcd0360825c5f46ecd826078c629377ed15e8412b7e154d2ab1178623d348d6baeb37b6d3565af88f53408e661cae3d1bee760bd1eb55 SHA512 ff3f0320a9a5c98eaa26a873101afb431f6ff37d05f0f02c0b09f381129b4d1f636448fe64831e6cea76dee5be2ab725e62d5eb230974049b8f5df11277ec064
+EBUILD wine-staging-4.8.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
+EBUILD wine-staging-9999.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
+MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 030478b4da45..2021448c4735 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -20,7 +20,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="capi">Enable ISDN support via CAPI</flag>
 		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
 		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-                <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
+		<flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
 		<flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag>
 		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
 		<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
diff --git a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
index c7cd40a2b6f5..29ab363a4856 100644
--- a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
@@ -456,6 +456,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-4.8.ebuild
index 1fa673641c44..fa474a55dcfa 100644
--- a/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190316"
+GWP_V="20190511"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
 HOMEPAGE="https://www.winehq.org/"
 SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
 "
 
 if [[ ${PV} == "9999" ]] ; then
@@ -130,7 +130,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.8.0 )
+	mono? ( app-emulation/wine-mono:4.8.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -164,9 +164,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 )
 PATCHES_BIN=()
@@ -456,6 +456,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index c7cd40a2b6f5..fa474a55dcfa 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190430"
+GWP_V="20190511"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -164,7 +164,7 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -456,6 +456,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 681df4bbcfdd..3b8daa118f63 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,23 +1,26 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST gentoo-wine-patches-20190316.tar.xz 58848 BLAKE2B 76e66749638589dd6d6eceb4b78690483d14353597a4e47fe9e5325d8bdb2bceff66040c110f63b8bae698bc5838c280c048ff7375ba2ed8cc387cbe0422c79a SHA512 de2cf844ae686144c3f95f0a360c7fa8a62185500758f994b5a65836798bdc3092138dcd9c36d0267a6fcfdc13585258d31b281244a97b45965f40e0f2b29eda
 DIST gentoo-wine-patches-20190430.tar.xz 58896 BLAKE2B 96c30ee48c4c50720abe8bb1d5a7c2e8ba0691dca3fd38b3807e2b2269236bccb3da18e59b4e35c2703cfb725300ee53c95e9ed584dd9e2c4184b31716b6b4c6 SHA512 52970b1e0673ae84e614db33536e9fa64bb6497a6f19c462f73ddf6b3239f38c9d59fe1c379cd67ef613c0660dcf84e2753e54647f01a8a1b2ee95ae4bb9f8d6
+DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST wine-3.0.3.tar.xz 19735412 BLAKE2B f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8 SHA512 11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
 DIST wine-3.0.4.tar.xz 20556944 BLAKE2B 122c06e38cae9f9d2358908d0d325ed4e0dc3d1bf3e189fcfd1a713ca147d5360934cc21c387939bb5ba6dec9410d85b586d95207089b6aa033eea15bfc209e3 SHA512 e1ce33bbc165a9c640a38965a229b757b67746f2150d545eb0e29ba6d21cdf150bd8eb9a450d8dd71733fbea3b2ac24839dd8e381b7da9cd15ddf98c59304198
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
+DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.4.tar.xz 21805668 BLAKE2B cf973240a3f2a1ad1cac8690cdc5cd86be428220395d90bfe3b15567e6a2be0bb78e5828de3b77b617827122f5b0bb1dfeeef351102ca001722340ceaeb5625e SHA512 6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000bb60db2f302aad49622192077b45880d45ad33ba4d82bfe3403fb82a1e65159f1352b40933de
 DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
 DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
 DIST wine-4.7.tar.xz 21962632 BLAKE2B 2f90212c93fb089fafb0dd44189044b3875a52e3f6b5300a44893ac9760afb398330c293abbffca15cd9f9a6da72e97c2702c04525e02663186d723f1f322da7 SHA512 cb768528db510f81d464b9c1bb48847162baaa86ef00dc7a418afdce38aa51262d150c14b3362fb40c93cc2e3633fc02b2916167f21af8a708eb393da6ba9163
+DIST wine-4.8.tar.xz 22024100 BLAKE2B cf87407a5fca83660c866a17ebeec62a97404c1eeb1d7b34a0995510e04aec2fe0350b644870a3d4817177b002cf07e69cd6761593122c93c22bda50bb8aec0b SHA512 ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab
 EBUILD wine-vanilla-3.0.3.ebuild 17120 BLAKE2B a8cf3d4872ba5f91a691817bfc9421a6a5bc1079141c8c3d53dc5726bc2aacd46090d253390278ec5e8e19c63e613c1289a62957a75487f7dc10ee68b8e4778d SHA512 36c54300f1d396a0e5d990316525dd68103a5e25623e84134b35e708d35d7c8b4cbf6100e91396b29daed058fc64a51bac39b7b14684baffafe1e2f05f695b23
 EBUILD wine-vanilla-3.0.4.ebuild 17085 BLAKE2B d1831445374f36c0fd20b930b2786c79054473868b1d319d1824b935e5e3f2fd07aafa24948040ac1cade51e5748843438f51e473a385c654fa3fe282277e0d7 SHA512 20342989e375114278c77c3dbd8fc1e9483281ab4147006a5f7fc6e657287c327b25cf002581c1a94fec9e9e982710b179415af4cbcf9eebae708ac41079765e
 EBUILD wine-vanilla-3.20.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
+EBUILD wine-vanilla-4.0.1.ebuild 17349 BLAKE2B 7b7039fa758f0c0cc786edf757e9ffa3da2aef90f723ed4a84b6079e0d62c52a55ab4a82388b4f2864cd07e35668bda72f21064d2f69c773d045622e26812699 SHA512 794293029f75fd2924b3e02bf5f79ec610480083b75e4b45916f645a5ed53386fb2391a13ef2a382dc79ec9a2e3dbe737662745e91c315c34aff80951a5b0b80
 EBUILD wine-vanilla-4.0.ebuild 17341 BLAKE2B bdb219c3352300bfa6bf2194696ed44a4632170ae6c03c938203c57b9b6aa23c5de2276a42bc9943dfbcbc942214fcdeb7a313deebf25c9b8570c3fe51c9bc8e SHA512 65e06fc637ec397e3365d7be2e58b130852675a93ea235e6066e01f9e5b7efd098868fdc1c3fce810dd72dd1c0e66bab9a4941b7f3a1ceff40a744776cb91055
-EBUILD wine-vanilla-4.4.ebuild 17388 BLAKE2B 0c48871fe460ccd760330f3c380ed0307cdb093a1319a8fff239b552b78a17789320e2fd19d8dfbd32282f6a2926f0545b37f4df9dd5bb9d897dac0f5c8f1210 SHA512 acc0d5ef46f73a50aba5e9d8bf54513a769265af38f52289842a0122d64f93309654e76a5e5f618fa6396c2455edf939c4545e9199d14cf2d75371bf29af6ffe
 EBUILD wine-vanilla-4.5.ebuild 17389 BLAKE2B a6ed1703bc53e986e53ead04bff804a0cc2da4f704ffc018d980fd1a4be5cffc49b57565edf148286d0d5501cb0c6381dc17b92a93b51e899b50b3844fc978b1 SHA512 8ed9bd56ae83e179df73a55b47c04a6f8fb124e065c7ca6275c74eddbed764293f41ab4c0799cff14a9596e486eb0c871602946bf8e82fe4b4f7db17c975e64b
 EBUILD wine-vanilla-4.6-r1.ebuild 17389 BLAKE2B cd54cb08e094ee3b32ea280dd335c8572ee55fbd18071e1cd5796672c110faac5fc5b08613332658ea7a101d5bca903c7b87e4f384d4fd9f6c716aa5cbd51de4 SHA512 a6ddcd8036dbbe714bb7e406f35be62e4b2a37f49048a1b16df0fc0a7aac09ed013d573d475c48151beb15ff6c032089ff8b078ddd40fef643a7a040e8e69bd8
-EBUILD wine-vanilla-4.7-r1.ebuild 17387 BLAKE2B a8afb6738b5c26abbd9346dd89187ba983c07c1f91d57324368faecbea2716440ccf8763c389fc3be0a5cc5c829b586e89b0c203672bd59881d4a63ddb55509f SHA512 645cd0d689f715ee4f7863b701cf501264c7400eba31ca4a68eb9870572c3e5ae4086841a28b1a387600b442759daa0599acfcc80a1e1edd6b4fc9e3555a0385
-EBUILD wine-vanilla-9999.ebuild 17387 BLAKE2B a8afb6738b5c26abbd9346dd89187ba983c07c1f91d57324368faecbea2716440ccf8763c389fc3be0a5cc5c829b586e89b0c203672bd59881d4a63ddb55509f SHA512 645cd0d689f715ee4f7863b701cf501264c7400eba31ca4a68eb9870572c3e5ae4086841a28b1a387600b442759daa0599acfcc80a1e1edd6b4fc9e3555a0385
-MISC metadata.xml 3273 BLAKE2B 1a060f5a0877c948b46a7fa128e265b682c3a367651629454a38114a112c4d43faeb53dfc335f10e84635fac6adf50f8b9429f060252e11191dfabee031dc81d SHA512 151c4e3b2039180194e6d50983ec4d298296810b2ad794b06a4189e07d0b4800afa4ff62a9b3133bbf04b02644da9938b6f5139fecb332f2dcf955f9e3f34faa
+EBUILD wine-vanilla-4.7-r1.ebuild 17450 BLAKE2B 161e709bb04d61fb6f9eba1ada3a602210c9836f68db1106a39f83a14e603aa039f3a46a468027297d6d00d5fd007b9c5f119c9bd69f796099c32600c3aa1d00 SHA512 ec40c999dfb76bd2706525cf6a08b4d8305ed9105b3a5374cf48ed23b41f78cc5958a041125302d4626fd17277ea82f658cccb8d1b4a34d74148222b9634c456
+EBUILD wine-vanilla-4.8.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
+EBUILD wine-vanilla-9999.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
+MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index ae58a3f5b900..359856c711db 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -20,7 +20,7 @@ This variant of the Wine packaging does not include external patchsets
 		<flag name="capi">Enable ISDN support via CAPI</flag>
 		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
 		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-                <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
+		<flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
 		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
 		<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
 		<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index 88c369249e60..70856ec14e10 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -19,23 +19,24 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+        MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20190316"
+GWP_V="20180120"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
 HOMEPAGE="https://www.winehq.org/"
 SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
 "
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -59,7 +60,6 @@ COMMON_DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -109,7 +109,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.8.0 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -139,7 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -375,7 +375,6 @@ multilib_src_configure() {
 		$(use_with cups)
 		$(use_with ncurses curses)
 		$(use_with udisks dbus)
-		$(use_with faudio)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
index a10f0dced803..d14473cb1758 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
@@ -387,6 +387,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/wine-staging/wine-staging-4.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild
index b12f4ca1e78a..70c9c99fce97 100644
--- a/app-emulation/wine-staging/wine-staging-4.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -24,36 +24,23 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190316"
+GWP_V="20190511"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
 HOMEPAGE="https://www.winehq.org/"
 SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
 "
 
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
-	ffmpeg? ( staging )
 	osmesa? ( opengl )
-	pipelight? ( staging )
 	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
 	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -73,7 +60,6 @@ COMMON_DEPEND="
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
 	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -83,7 +69,7 @@ COMMON_DEPEND="
 		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
 	)
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
@@ -104,17 +90,10 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
 	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
@@ -130,7 +109,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.8.0 )
+	mono? ( app-emulation/wine-mono:4.8.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -150,10 +129,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/yacc
 	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
 	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
@@ -164,9 +139,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 )
 PATCHES_BIN=()
@@ -265,21 +240,9 @@ wine_env_vcs_vars() {
 	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
 	local pn_live_val="${pn_live_var}"
 	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
 	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -319,19 +282,6 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
 	fi
 
 	default
@@ -350,23 +300,6 @@ src_prepare() {
 
 	local md5="$(md5sum server/protocol.def)"
 
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
 	default
 	eapply_bin
 	eautoreconf
@@ -443,7 +376,6 @@ multilib_src_configure() {
 		$(use_with ncurses curses)
 		$(use_with udisks dbus)
 		$(use_with faudio)
-		$(use_with ffmpeg)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
@@ -455,6 +387,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
@@ -484,12 +417,6 @@ multilib_src_configure() {
 		$(use_with xml xslt)
 	)
 
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
 	local PKG_CONFIG AR RANLIB
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
 	# set AR and RANLIB to make QA scripts happy; #483342
@@ -574,10 +501,6 @@ pkg_postinst() {
 	eselect wine register ${P}
 	if [[ ${PN} == "wine-vanilla" ]]; then
 		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
 	fi
 
 	eselect wine update --all --if-unset || die
@@ -602,10 +525,6 @@ pkg_prerm() {
 	eselect wine deregister ${P}
 	if [[ ${PN} == "wine-vanilla" ]]; then
 		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
 	fi
 
 	eselect wine update --all --if-unset || die
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index a10f0dced803..70c9c99fce97 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20190430"
+GWP_V="20190511"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -139,7 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -387,6 +387,7 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f65bfd2e179b..fe65ea2008b0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -22,13 +22,14 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
 DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-1.tar.xz 60048 BLAKE2B 60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76 SHA512 788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918
+DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.3-r2.ebuild 14270 BLAKE2B 9d3452ce90498bb4db604d8813d6be2ad5989b7a0d9719868cdbe83ff2ea3b79b23bbea316bb2473f52e2d7cc9c14eea78426be02c13f7a1510deba938729516 SHA512 2a795d0296edd20b52d95f96d8c3d0fa5dc8110cf8b106d5d26a2c91c3311b9fa38f08dbf162a6452a21ba2a5530ac9b8b69b59d056d251720b555181a25b960
-EBUILD xen-tools-4.11.1-r4.ebuild 14499 BLAKE2B 7a491bf6b91c0c8bdd47cbf8a72c88ea999d264bdf71e674dfbd28d3fabccbb4189bd5a9aa37f4ddda7171f5bbf64dcfdb2fa731579af8fa54a32590a3a25a96 SHA512 f9f6517dd5de8254701448349220e7922aa83907b7de6214e05b80a93a8d51497a10a46af668cb177c199561d7cba720550cdf541625b5981e3b873c6622682f
-EBUILD xen-tools-4.12.0-r1.ebuild 15007 BLAKE2B 2e1469052ab4592e59d4237fd0dce38f02107eb1997773abf15fc3fd5ee604c867df3224b1b073eb0c956d82eefdefaf506c1faac6fa994ceb5fd24178e783c2 SHA512 f3d34e87fcee98d024a1f3f57f610c7950408c4fa66e0e62deeec3f383e81ab1f7dc4b3fc5b753c125af2eea4461ad2858976e700ff1c8b4e7d08f1b9fa4d2b7
+EBUILD xen-tools-4.11.1-r5.ebuild 14499 BLAKE2B 57aee1303bf56cd15967f56da5fc252837b28be7c3afb0c63036e979e7b1b5d99960e564a1c333a2446313460a243301e4ce112acb4b8d9904aadd611e231f50 SHA512 b14390507fff50a6e4351651ab91f0596899ceb181607b69c474e3d231361f48b9cd06679ab2db36ca2ad590a46735c428bbc11309ea478abe2b3229c0c75b80
+EBUILD xen-tools-4.12.0-r2.ebuild 15008 BLAKE2B caf0a02f1c207650ceefc46d07246f99192437a765c9affc989e0e02049bc2d7f3f87707fa88afa1053cb8777945dc8c67d9dd7795c35a857e496e394418d3a8 SHA512 c28528fe67f5459f57cabd3a2df73f99c9da78838f3a23be6f8ffa08625978a36d0a522c18fb4f0224ab31ae7158686315e6ba387fda1c242342580b6dc6524d
 MISC metadata.xml 1479 BLAKE2B 1b994f8dcaa5cf67f588af6ce9533467816f7c4726e412566640138e631427decaf890856fa255b516580502c97c2e29c21bb84b4888df7603a9491a012381a5 SHA512 d125649737e0b34407fb32b67b741feca60d100454fdbc84b07305849295f134e1b657f5e13b6e74a90d25d7b408880316d470ee94447b7a6f99abd75eb82a83
diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
index b197b31b8ed8..afb37d506303 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=17
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
index 3084ea4bee92..ea900713a631 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=17
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 374f4a5da9c5..ac4fce169edd 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,12 @@
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
+AUX xen.gcc9.fixes.patch 1265 BLAKE2B 0ebf81cd2f43a0da99b4580b0bb9ac09128f26674a173bc74c2dbdb1f668148230d09b6b90a29f2aeca54a6e6107b9001069765281cfe628640e348e2961cf7b SHA512 c305c526732e479e95684f74ef3f90501ff33e7da38e38c5ea373f3db28d40e6fcd7768c4420d43268fb71fcdbd1e41b217d0a317ad74a8c073a2af12588a832
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-1.tar.xz 60048 BLAKE2B 60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76 SHA512 788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918
+DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 EBUILD xen-4.10.3-r1.ebuild 4795 BLAKE2B f1b5a6416aa0157162eda97a4d889f46325b51144d9aba769832ec7f503d7ee4cd74c580fdb6b61c51894abb9fb2761eef80183c6c4666fb65e1295aaf08c510 SHA512 6d82456c23ea10b238edb48920d5bc00ac262b2593415dd6f1528336487c036b100c0f8fe00afc109dd9dbdeede9909d1c7d8f2e0423e586f5746af280b8fc6c
-EBUILD xen-4.11.1-r2.ebuild 4796 BLAKE2B f556a3cb83ea8dd6d59217dba949f31df8331ff0eed1a47548a15f3c7eca685a826e6005cc804a91c1327d54cedbcd4f719ce04c56df44d74e6e6b00bd2915e5 SHA512 af81b70e0984125de5ef57087dd5ed799ad968fa25c2b6fb18984bdcb2e30aa812b46602866fc0e57716813370ac9d837816b39ccf0ad743ffdb58502d5f4b41
-EBUILD xen-4.12.0.ebuild 4795 BLAKE2B cbefe3730fbe04f78f923d091112033974fa1286f08e8170b53e3c9bc4f93f16ac6b3183380a1ee0eea9872418ddf63b7efd72a6ec500ab9203e6dbd2ffa4de8 SHA512 d348049aae53c426a45da0371472ad09d578706b7cd772444f0fd0394eecc8d5cbb6ee5d6cdc1a854119791af908ae416b4e615598103e3b900b8740514148d5
+EBUILD xen-4.11.1-r3.ebuild 4919 BLAKE2B 71325d57eebd04bf8329f02c67317c2943af99a69b7edd410351bc4af916014e06327119ee696d4a61ae9b24f76c11ecbbeec33b570393b3d485528382a60bdd SHA512 6525b31f58a9487c8d5287aff58c11cbb9d5fd1e084e72785f2c9c84a539eab3eaee704ecbcde49fa17ae20384b0a701e19183d0145496fa28eb62045f111d90
+EBUILD xen-4.12.0-r1.ebuild 4919 BLAKE2B 2c1bbe11f0342fef28e7315dd8a0635cae7c40508f8ac9e177be1051bb3b3618835b37e155f8734996aea4b9a65e5d8fa6102f579a4ef2ed8adb3234aed20d9b SHA512 baf9d3881cd2ad8810dc9960aa4b27798aabec125b65d62c1824089eb2b91a140cd1821693fca0ad7b5739f1d5b8c83633764745a4c73fd542c62dc4b784c7db
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/files/xen.gcc9.fixes.patch b/app-emulation/xen/files/xen.gcc9.fixes.patch
new file mode 100644
index 000000000000..111b063f9c1d
--- /dev/null
+++ b/app-emulation/xen/files/xen.gcc9.fixes.patch
@@ -0,0 +1,34 @@
+--- xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h.orig	2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h	2019-02-05 21:32:50.056774501 +0000
+@@ -28,7 +28,7 @@
+ /* Allow for both IOAPIC and IOSAPIC. */
+ #define IO_xAPIC_route_entry IO_APIC_route_entry
+ 
+-struct IO_APIC_route_remap_entry {
++struct __packed IO_APIC_route_remap_entry {
+     union {
+         u64 val;
+         struct {
+--- xen-4.11.1/xen/common/trace.c.orig	2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/common/trace.c	2019-02-06 20:31:27.370256971 +0000
+@@ -819,7 +819,7 @@
+ void __trace_hypercall(uint32_t event, unsigned long op,
+                        const xen_ulong_t *args)
+ {
+-    struct __packed {
++    struct {
+         uint32_t op;
+         uint32_t args[6];
+     } d;
+--- xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c.orig	2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c	2019-02-10 19:24:09.378805103 +0000
+@@ -171,6 +171,9 @@
+ 	printk("%sMTRR variable ranges %sabled:\n", level,
+ 	       mtrr_state.enabled ? "en" : "dis");
+ 	width = (paddr_bits - PAGE_SHIFT + 3) / 4;
++	if (  width > 64 ) {
++		width=64;
++	}
+ 
+ 	for (i = 0; i < num_var_ranges; ++i) {
+ 		if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID)
diff --git a/app-emulation/xen/xen-4.11.1-r2.ebuild b/app-emulation/xen/xen-4.11.1-r3.ebuild
index ad9b169a8a53..8eef8eb0de46 100644
--- a/app-emulation/xen/xen-4.11.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.11.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -100,6 +100,9 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
+	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
+	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
+
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
diff --git a/app-emulation/xen/xen-4.12.0.ebuild b/app-emulation/xen/xen-4.12.0-r1.ebuild
index 66e0a466695c..ca265f67d882 100644
--- a/app-emulation/xen/xen-4.12.0.ebuild
+++ b/app-emulation/xen/xen-4.12.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -100,6 +100,9 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
+	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
+	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
+
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /app-emulation
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)