gentoo resync : 15.09.2019

12 files changed, 115 insertions, 82 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 95ae9100d2dd..3e52be39ace9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 661271fd6d17..1830d22c4447 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -2,12 +2,14 @@ DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af
 DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
 DIST buildah-1.11.0.tar.gz 10065996 BLAKE2B fcf709f7474bcb45f2da6f90b614b4c95036d19c05fad715f80720efbb9ad6c4be6725001de4b5198c7d81e365ff12a742b73bc5d7268819de56c4b2fbe0b8e4 SHA512 a5e852a427de4e3f3ce8d78fb8ea82e8b6e0a1bcc6a0bc786c2bcb0d4689fec5f5a6413f77898bd953dc7eeea31d1d58fe22fac40cd5209fa5016a376a9958b7
 DIST buildah-1.11.1.tar.gz 10126770 BLAKE2B 88ee8aa43490b12e0e63cbdae24d62d8fd10f8a502689dc30b748213aaf32851bc83c4fce38316f79523e3fb3a7110fc763d8bcbd24181ae45abeb5b3eecdda5 SHA512 322fe1b249ff6db160bc1dc111d19ddde8f36ae931f222aeab21e0b39f60bcbe9ad8b11cb6ee088b028478d6774a2fb231b6d457ed4c30cd5477b4a67ebcf06a
+DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
 DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
 EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
 EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
 EBUILD buildah-1.11.0.ebuild 1446 BLAKE2B 8dc0564305db4174600aa2181a0ca5c67c4ba8c2526e148a58eff60c0078057f0a1d1c139a25167a7ba2919a1c069f2026b5f357f88217a65234b647059eedec SHA512 42b645d49dde0685aaf444166c2809d424f7fcfcaa1ebf07c919c5156988ce0b320397770ae7d4108bdb1ff40cf733806d0b1296330949c96d83d4e59df8d198
 EBUILD buildah-1.11.1.ebuild 1446 BLAKE2B 86efb60a185258e544e9ead22fe4f623bb6e3cf23be41c8db6d2e45293706fac719db412596c9168b9e9926d62334f35a45022594ad1f0ca21e95afd42402ebe SHA512 c2ecf53db18fc1db4f698284f1cefa037f41d5c0e48471377a2bbefd5f250221da813264c4754d2fb5b179ac1fe302250f2cc744cfb2d50bf51c2561d45a8dc0
+EBUILD buildah-1.11.2.ebuild 1446 BLAKE2B 1c80aa7272d8bb835a02405da85e58a5625c77b8ea975ff45430e99c1046e81642e8ae0c158e2e8d9e63932d86588c0635de111aa33c2aeeb786e80d25576db0 SHA512 7450b0c90cf10bfa964b8da88ef76cbc8ad8267a8718ca3514c85acf77f551fcceeb3e63ee26eefa02b2ffb5c7520a1651a86db60e3db5795f94d2e9730bdbaa
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
 EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.2.ebuild b/app-emulation/buildah/buildah-1.11.2.ebuild
new file mode 100644
index 000000000000..8962d91ae9cc
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.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="0bafbfe"
+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/conmon/Manifest b/app-emulation/conmon/Manifest
index 129e54ec91c2..ce300b1e71d2 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,7 +1,9 @@
 DIST conmon-0.3.0.tar.gz 49021 BLAKE2B ca753f8fe0801cef4e392e2f60e58c51100628f0576c46d139c9c9827a927970ec63bb0aaebce6ac6ffaedae75b141730833b8adcafc8d9777900d96319edff3 SHA512 9a60f3eace596a8d12dc950597a9e3619a6728bf4555bb1636da3ac8ed8a6bc2ae28471cba9c7c3ad04b61a24aa4bbd28242a22940240bf27babb834031deea4
 DIST conmon-0.4.0.tar.gz 48889 BLAKE2B 50bfa534d04428b422902ab3cd4feec5cb1cf7a6411eb35fc2420680eccc95dd17d7cd1ed8af904f6d246f10511b23b69ff112fee70d3a734098fcd7f5d7d7e7 SHA512 6aa9e0f72231bd890df4f4fe96b8831ad0fcb3e1f0edef74af8471aa227aefc3d8ea20d8bf0d50a6c06913c6360970464ea1b44fb68c77dbcc2da55073704bdd
 DIST conmon-2.0.0.tar.gz 51805 BLAKE2B 4c9e89c7d2339c82eda41b35f014ef392e185a28e93e81770bb1b9c629709c9b20ce0e7d78a0a1e2a68193e791ec45e70d427d8f4533adf5817bf806e919b524 SHA512 0d903f1b83248a130fa6a5c212f96a5bcc37113cfb93c73847a3744b9da8ca355f93f16ca57f4bfb50bcba13b272f23970fdec8ab7ac1862e93b3057512e572b
+DIST conmon-2.0.1.tar.gz 52250 BLAKE2B 59d0786975d0332ce2eb68024bbfe4c3275388d1e12561a279918fb4d2fdc2c8fd24d5872b724ccbc32722b50debf2de5c9e904aa26e25c3363f0418f5f74f8d SHA512 ba7ccdb61b6092987a3fe0fbcf76c11edaf4e15e4af4d831a8e5fdd58202a81be4d9ddf5c1d71eba5824b284f3b4416a65864e19d65dec4dfd511210c75480b1
 EBUILD conmon-0.3.0.ebuild 917 BLAKE2B f725e979caeecc2467d5152230530b4cc0c63f536c0dc47c198b2c0b03e41b365b12e0f0f707cb598ef757e5d294611d0926457ee1e75ad71d1b5a8a817ecf1f SHA512 bf854a15acae1b18a6ec2ca80a5063ed64da5b46b4b39d6a8f213fd7bd7005ab672e3ede077531fa01dc32c4accb00651aaedb27294b56b7ec1bd0c70b61bd1d
 EBUILD conmon-0.4.0.ebuild 923 BLAKE2B adc16561c26da5483166b64cade0b8964f8549145f9bd503187c1d17829794c6dceacfa5276168ac51f33d5bdca5bd616c08db33f44c7f57ae0bb93d057f1ef8 SHA512 578a793aed849dc6f438a7ce35e9c9de1b914831983c423e01ab4496848699513a87ae78f918d06943636d533720e234c80cab2b8d567d564ccbd1cc2bc232b0
 EBUILD conmon-2.0.0.ebuild 923 BLAKE2B 3e6cf43b42c098ce9d4e3ec7cb62884c5587d591c0e2f1060d323954102ffeff7710a44de0560aab5ab3652c1ce34e9669d550d5057504d11330c35ed28fa256 SHA512 ba960efa3aba615d0ba4b82b832072a383c01acc2b4ffaa74af454bf8fe2bd86984fc34eb681927703868e707730d74887fae12d707cff3caf993978575b99f3
+EBUILD conmon-2.0.1.ebuild 923 BLAKE2B 7da7a89493aaa48a78e3eb9feb22ac959286c938d0c5120d70ae23ac4c86c7fcb70544aec33e1379ad569ee4c4979a380a97237934e70b743f82e0b55a01aee1 SHA512 261c988791417e610e006e16e6faae6c313387492a3da3f6688de823616736cf14acc1ca47b05f54d20246db752c78d931ee6ef04be1c50b7d2695e197be8634
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.1.ebuild b/app-emulation/conmon/conmon-2.0.1.ebuild
new file mode 100644
index 000000000000..53fa885d0ae0
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="4dc8bcfec41e10ca760c8e2089474c2843dfd066"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+}
+
+src_compile() {
+	emake GIT_COMMIT="${EGIT_COMMIT}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 51caa7ace54c..169238ffd7d5 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,9 +1,5 @@
-DIST slirp4netns-0.3.2.tar.gz 162136 BLAKE2B bc33c66ecc47e0b566eaa960e1651a0ad0b09010bc9ae3d1eb0692c7b2b67197a078b25df645bc11c50f1e805937b8e0aeeecf2fee6114937ca98eda49f61765 SHA512 b5146a9b165471037542af64618da8fb5f6824a9a4193867f4357b1b7f38082dea00e15930561eb9729fed406dae1bc2ca371035577d0f22cfb9004c13464496
 DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
-DIST slirp4netns-0.4.0_beta4.tar.gz 168436 BLAKE2B 708a92bcdd8f0d1ce925a013d999b3a172391ffaa1dce2f414a440feb8933cdb2f5986badfbdb98c98705ef414d86a353f642e1d8964d3ca700a39527cbf6274 SHA512 2dfe5be6c6b298823e2ae4f72ea11afa8d16a5c6ab9a88522775949508a6f6edfe5eadb3681b7d1300f21a93ebfa1791f04e27066cefdaa988fc12f385ee6340
 DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
-EBUILD slirp4netns-0.3.2.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
-EBUILD slirp4netns-0.4.0_beta4.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
 EBUILD slirp4netns-0.4.1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.2.ebuild
deleted file mode 100644
index a87e63fe9495..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libpcre:="
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
deleted file mode 100644
index 87e485ef0571..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV/beta/beta.}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libpcre:="
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index dae8d5296ff3..137e76b5c734 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
 DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
 DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
-DIST wine-staging-4.12.1.tar.gz 9920469 BLAKE2B e76f1efe205fea913c8ae50e290f271a07f46ae5a9fe4a521d9e96a8834ff7eb70aa0d42a6d308ca081b14628bbb85e1c638dcfe7fa732a5e25a3a20e07b0b67 SHA512 804e99567632326f5ea55fd86c4ed236da3b3636b0aaf5dbf4427694b0786326bd048fbb119b37fc66d4072dacec9ac354b804ad372cad69cbf086360eaedc38
+DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
 DIST wine-staging-4.13.tar.gz 9913015 BLAKE2B 125b96fbe2de3c6d5c302dc25f0d1ba65fa3deb00a76c30a55e9fe43ad06bc3cb7ea18f542638268c1e854effedca557e837512b54c92905b928d83b33aa6aae SHA512 a5240b3999b1ba605d16148022e57a4574c0e9288763a5c4a259ea06c3a7152af8b136b0e2b8a74b1a40fb6adaf5ce012695160afdd5364fa1b4c7a903fd82b1
 DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0
 DIST wine-staging-4.15.tar.gz 9904734 BLAKE2B 163d6f51a6fe649c8c107b013aafa5c5729bb93cafe94446cde966138c18d5aed2e950ce9a71ae4c719efb358406af079efb21cc8546d97e2b7146a5cae27a56 SHA512 0c34695c1d39773fb34a58f0cdb91d427945615e7b76b8a7222bc84fda8df08125832297b75aca55e69511b6b3686df70dade84bcc7cc9324f30c042146761b0
-EBUILD wine-staging-4.12.1.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
+DIST wine-staging-4.16.tar.gz 9905714 BLAKE2B fe72d1123c7f418dc9702b113679de7d21a8f20b2bed5e9b2f7a2b411ca28b407e0d2d134dee19ee06414df7a3ccfaa784d5689e3dc79043544d17c6768e6a17 SHA512 8782e4aecb34443404b1ac02c6b1ba91887ad12f07c7960601f879b034937d5ee6f1c1493437e765804beed6e68fa20383f7c02a09534526cc5f4bb857048faf
 EBUILD wine-staging-4.13.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
 EBUILD wine-staging-4.14.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
 EBUILD wine-staging-4.15.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
+EBUILD wine-staging-4.16.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
 EBUILD wine-staging-9999.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild b/app-emulation/wine-staging/wine-staging-4.16.ebuild
index 0804c00c2432..52c20dca7b4a 100644
--- a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.16.ebuild
@@ -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.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -356,7 +356,6 @@ src_prepare() {
 
 		local STAGING_EXCLUDE=""
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
 
 		# 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"
@@ -436,7 +435,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -556,6 +555,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -566,7 +568,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index cd09fc13e02f..b1f6447ebd17 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,16 +3,16 @@ DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f88
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
 DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
 DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
+DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
 EBUILD wine-vanilla-4.0.1.ebuild 17343 BLAKE2B 57e3ea58827294e7719352b84038074a2a2e7a56f1030db21891afc2d275eec4481751a53bbea59d23028e40967dc9f1751f3b170cb36e669e55d3f7152708db SHA512 2b04e442062e88e663b12139ab82d20df992787936987ada9394d62b1c208fa5be6a7bd192456fb027a3d730843a135091155956cc539e8481c916e3dbfe209e
 EBUILD wine-vanilla-4.0.2.ebuild 17345 BLAKE2B 72ea2e1202b57a6da506c22daf73d9201296b5c34879960ca0217b31a50c7f798535478bbab307c7568d4e0e75c053e0ba2cda5770e9801bc95c68f67b073366 SHA512 260cf6d90fa053a8c06bf602ae918f42b95c1f56b51fc374086cff4e370d1d5be1c1a9eeb458130f6d9e1bc03a31b8afc2922c6b57e1488e4d59423037f35cde
 EBUILD wine-vanilla-4.0.ebuild 17340 BLAKE2B 44d7b71fec5fd62ad3403f881da67b2f6bbd7eb21cfb5e766fd6542967f88aa8dd42e9c4e2760ffb2e209ad45f7e7c64e522cfd0a01101765867f7e8260c9a08 SHA512 fc2eb099e3687cabb2f3a361760c5261f06e858f8046e2298df82c51b9b1541ed4c00a48709ff89674f48ad466ba409fa8e1702d1949d69ea86770079ffcc9cd
-EBUILD wine-vanilla-4.12.1.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
 EBUILD wine-vanilla-4.13.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
 EBUILD wine-vanilla-4.14.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
 EBUILD wine-vanilla-4.15.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
+EBUILD wine-vanilla-4.16.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
 EBUILD wine-vanilla-9999.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
index 42d4ca69bfa1..d6779b0d96a5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
@@ -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.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple