gentoo resync : 24.03.2019

23 files changed, 792 insertions, 64 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c29cfe770fb0..daff2ba86470 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index 2406a0a00ef9..3211a68e7f14 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -7,8 +7,8 @@ AUX registry.service 323 BLAKE2B 1be481d08a283793d10ef870fc299e1c284087878e67ec5
 DIST docker-registry-2.6.2.tar.gz 1579760 BLAKE2B d0e067f2e9124847b5e362f23ca7d67655fbf0a6227efc3fd9073d5360389d6d8531e5709b52225c54e6e3097a2d5d79102e27fd09412b95d2e5d8a4a30dde2d SHA512 a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60
 DIST docker-registry-2.7.0.tar.gz 1996485 BLAKE2B 49022546b72a1ea2b457a3dc059d8940bfba3070208b2962f8acd1351312d568d6facc1690ae8ee78742b5647c3a84bd6538a9eb0c279aec0a8dfae2c823fa61 SHA512 72bf5f0953c58e4d1adf6427ee13a9456204ab278d4489277e4dd1b3a3df6717cc02c966cdfcdf77d86e769209fa18e377e0b12a6c02b9f58980185e9844aec6
 DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
-EBUILD docker-registry-2.6.2-r1.ebuild 1199 BLAKE2B dfe3762a2b4e593b653fd2a8ef2eda0b1988163daff5551280c34f8e078a69c802d615be55ae257bcdc24cc9ac76e32317133cd6bc83d3f536b206332b7bd073 SHA512 1405e36c07065c0d6c75fc59548b64f5bc9e69726324e5e6f552be1790cdcf4057a78f6d770e3e1144c36b2edc1e483c1e455550785e263474942b676ac6f643
-EBUILD docker-registry-2.7.0-r1.ebuild 1253 BLAKE2B 21be455cf1c5f355fff318e3a6ed89f8b0108818d26066b8682c4c829eed60dd6ba90cc2cf59fd89433b3e51101beebf83f8e1313ee587fc7fef38d6d301b521 SHA512 211b918ebfe793e90af0e55e58f8a4a5eca0f51a3ba2b8959681e8d349cc242c405303f8045e346c458eae9b14f8fa2479f868fa2cb1ce54a9717cdece2ef0e6
-EBUILD docker-registry-2.7.0.ebuild 1130 BLAKE2B 04dfb05346a527aeec1be5446d506aa90620a6288f66a7d3c1119a7bfdc500a361a08064bd2104fd58b9462c061f33607e315d666f8579caa4484431f6e08a1b SHA512 d935b18dc1154c9d5712a698f5e12be20d4bb998d87743e5db7a46ff2c4ad7906ed6aae8b90aba404d6351ab24852cb1aee00b4ca1caf91267e8496c9c2bfd84
-EBUILD docker-registry-2.7.1.ebuild 1410 BLAKE2B e4e87e3bea95a6201f8870e23b1eabec0d2145243d6b8a2a5397dec4b76035fd42e5564faf3879517078dd54d87b444cced1a9f09568d2ad04e9616acba56231 SHA512 2cfd015d986dea210a818c2eeddd15f5ecfe8aed35ea280b2a05e68d924dd8c9146716104f231cf3b687a6c771cd0ff48a739e2b9f9ba45d57f2cf8af7645d85
+EBUILD docker-registry-2.6.2-r1.ebuild 1238 BLAKE2B fdba66b66572f16b789491d79edc89ae773d91a5e5ceb05c62afc52089c59f0ac5787d90a84b54ffdce1724e1af23399ee7b9169842ee58513982398678594f0 SHA512 8f0b4f136fd4c05779f3686f3f06d094beef326d1aa8749b5aec1d0c89874e3c7f76861c2c9e403b084a78a411af8cbd1471aa9a15f60f40c23f6a94e1d8af64
+EBUILD docker-registry-2.7.0-r1.ebuild 1295 BLAKE2B 032c647b034c48c39182806e474607cb8f5da4f782818cd4f9262962586820cbd6dbff63795b6fb7cae7764395a36a8aba16ad34802951e689ca32fb85178f2d SHA512 0a399e6d88e8c5100773b5a5fc8c50cbdf4ba165bddc5d139b9041c9731ea78f66966aa402678dad5dfeb8731a6056af55f587a2926d370dd2d5290499168824
+EBUILD docker-registry-2.7.0.ebuild 1172 BLAKE2B 04e972be88aca9f4953e123e0bbf07d972dab7509d0bb7dc27b9a360c395f1282550438fd0b58678d3756208f92eed2538fe6da5362cead16f094dcf5d805929 SHA512 44a66bf217d5b504f254dcc5681efc74d20bb29ab5992e5dfdef8872b9c245da5ccbbc8071f8a34deee8af1478165c9ff91b3d880ada7e43be2e8cc8216414ff
+EBUILD docker-registry-2.7.1.ebuild 1452 BLAKE2B 0b9322c5a6ca1a9db7c3657d0256b898c5e9b8009d84e31706c4eebf2aa8d2e68175ed8754deb012eba892089e6f3df75550796bc5d72175c79eb2a9a0cd0acc SHA512 f64f8b6e27e9e443442308f599406d19c77bc9ab344f920702a15ca5a6bd82c7baeda2e01f1c55c478f0db26a95e67aff109416ce8d3ffc892e5af18203f80c5
 MISC metadata.xml 310 BLAKE2B b7a4e4e347c4b262857668fb0bba20e1efce6abc449cf3614538b34f03c897ce78e637db513a66e8e5ff9b1262df44d864aa41904ef7e86eee384bdafbb014cb SHA512 bcf043907e7e2ad9ef21a4b02b4aeb0f50bd17b1e5315653b2339036d4775bde661d711d4e84536f657c7bf9247ef446f1c95abdf14699620e44a104c9e1fe0a
diff --git a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
index 6ea2a86bd59b..863b9ac50826 100644
--- a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ pkg_setup() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
 	GOPATH="${S}" \
 		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }
diff --git a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
index 7f36e363292f..c117f1e13143 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
 	GOPATH="${S}" \
 		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }
diff --git a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild b/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
index 152ac01305b7..90b39c280c9e 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ pkg_setup() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
 	GOPATH="${S}" \
 		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }
diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
index 3ab8dea64489..57b97ad055d0 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
 	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
 }
 
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 4f2f56847787..68cc0597acfa 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,4 +1,6 @@
 AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 399 BLAKE2B 0b8d1126bafe49ecf1ca03c23efe51287a8b8b565084560caae054f2997d61c86f248e2bca3b511bf6e283fed8c47639d5ea266a147acc77cbb4b1cabc3b7f94 SHA512 a0d6dbe9dedbabb7700e2199d62814732a0d6f09be7758aa70565ba4d4cc1a86d848e3a9b5c743871a0052ee1b19b03615ee38a174634c7a339d218bab350b18
+AUX e-uae-0.8.29_rc4-no_schily.patch 708 BLAKE2B 8a67650e1b939149cc0e701538e15eb9e2ff85cce3c046a47210f82f5c3117b9d95e55b0ef2f0ab2ee0cc428b21d1b3b1afc4a3b6317eb9a88682bf7b571d422 SHA512 6f8bf99d031eb1f7363dd42a1cbea75689671dbde3782c76beb7e437c7f52b2daeea85cf39a819e586f4dd04c43df46d16a299409e99a8160e9750c7a336a3cd
+AUX e-uae-0.8.29_rc4-tinfo.patch 590 BLAKE2B f502517a50e3c61cafcfd2903b909e0fed7942877ff89e315f1ad0bb790fae6d293b242f5e1dc2897fea88e403e9a718bd01380b4c934287d2439979eb6cf95e SHA512 b5cad73be7a804f80ff5e73eba73c8d777ea5fb18ff829c3efe89ee4914bb08cfb87882b281b95d9a2a88967f2adf18971cc643a8442425c95d9f5d6cff35389
 DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
-EBUILD e-uae-0.8.29_rc4-r3.ebuild 4150 BLAKE2B 4f58a33bff8d386a8e15c98484fea0360f415e549f1d1701fe94c00f9fa001b0a3a84fec8ddb81924a2b73ab8328f0893b5a79b49a08e4dfa6e451f4e5ca2beb SHA512 7e0c65952d5163d5f44412834f3f73c529c874c0d8e88ca25121f8eff5cbe4fb864a82ebc462dd5c06fedfeb85a4e7777683764c97b3765b3c8e997c384961ca
+EBUILD e-uae-0.8.29_rc4-r3.ebuild 4143 BLAKE2B e372b1609cbcab1854280f232f1d059d066bb6eedd818f14bb5556d34fc6c7fc18cc03ca5f080ec7e61904eba1eca551a089bf960403421afbdfd5531a17b442 SHA512 51fd795cb83a6a4ef4c57472e40fffd14e42630e395ed202e4024524723bd00721dd90238f4dcf0238bf7904b2ccb9c0a9fc3fffa847496a1109998601f0a255
 MISC metadata.xml 465 BLAKE2B ddab23755d4ac531a0963f024bd4aff9b727f94a3aed47184a32a7e6f6c0b6b9d441c74cccd29028e831c9f290c8539a263317cc0e0d23928932a2f68c576429 SHA512 d66cf721c85633855983c22d2fd18e75635afe1fdd987b12a35f23caf1acb241398815ae643682864d3cd5099983b9b9c7581828ccd4668aca9d5b56fe9a8a00
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
index 63d99f142b49..27993eabc591 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic pax-utils
+inherit autotools flag-o-matic pax-utils
 
 DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
 HOMEPAGE="http://www.rcdrummond.net/uae/"
@@ -28,92 +28,114 @@ IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
 # src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( x11-libs/libXt
-			 x11-libs/libxkbfile
-			 x11-libs/libXext
-			 x11-misc/xkeyboard-config
-			 dga? ( x11-libs/libXxf86dga
-				    x11-libs/libXxf86vm )
-			)
-		!X? ( sdl? ( media-libs/libsdl )
-			  !sdl? ( sys-libs/ncurses:0= ) )
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-		capslib? ( >=games-emulation/caps-20060612 )
-		sys-libs/zlib
-		virtual/cdrtools"
+RDEPEND="
+	sys-libs/zlib
+	virtual/cdrtools
+	X? (
+		x11-libs/libXt
+		x11-libs/libxkbfile
+		x11-libs/libXext
+		x11-misc/xkeyboard-config
+		dga? (
+			x11-libs/libXxf86dga
+			x11-libs/libXxf86vm
+		)
+	)
+	!X? (
+		sdl? ( media-libs/libsdl )
+		!sdl? ( sys-libs/ncurses:0= )
+	)
+	alsa? ( media-libs/alsa-lib )
+	!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+	capslib? ( >=games-emulation/caps-20060612 )
+"
 
 DEPEND="${RDEPEND}
-		X? ( dga? ( x11-base/xorg-proto ) )"
+	X? ( dga? ( x11-base/xorg-proto ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch #527628
+	"${FILESDIR}"/${P}-no_schily.patch
+)
 
 src_prepare() {
 	default
 	# Fix for high cpu use when compiled with --disable-audio
-	use alsa || use sdl-sound || use oss || eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
+	if ! use alsa && ! use sdl-sound && ! use oss ; then
+		eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
+	fi
+	eautoreconf #527628
 }
 
 src_configure() {
 	strip-flags
 
-	local myconf
+	local myconf=()
 
 	# Sound setup.
 	if use alsa; then
 		elog "Choosing alsa as sound target to use."
-		myconf="--with-alsa --without-sdl-sound"
+		myconf=( --with-alsa --without-sdl-sound )
 	elif use sdl-sound ; then
 		if ! use sdl ; then
 			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
 			ewarn "sound on oss autodetection."
-			myconf="--without-alsa --without-sdl-sound"
+			myconf=( --without-alsa --without-sdl-sound )
 		else
 			elog "Choosing sdl-sound as sound target to use."
 			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
 			ewarn "Better use alsa... You've been warned ;)"
-			myconf="--without-alsa --with-sdl-sound"
+			myconf=( --without-alsa --with-sdl-sound )
 		fi
 	elif use oss ; then
 		elog "Choosing oss as sound target to use."
 		ewarn "oss will be autodetected. See output of configure."
-		myconf="--without-alsa --without-sdl-sound"
+		myconf=( --without-alsa --without-sdl-sound )
 	else
 		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
-		myconf="--disable-audio"
+		myconf=( --disable-audio )
 	fi
 
 	# VIDEO setup. X is autodetected (there is no --with-X option).
 	if use X ; then
 		elog "Using X11 for video output."
 		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
-		myconf="$myconf --without-curses --without-sdl-gfx"
+		myconf+=( --without-curses --without-sdl-gfx )
 		use dga && ewarn "To use dga you have to run e-uae as root."
-		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+		use dga && myconf+=( --enable-dga --enable-vidmode )
 	elif use sdl ; then
 		elog "Using sdl for video output."
-		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+		myconf+=( --with-sdl --with-sdl-gfx --without-curses )
 	elif use ncurses; then
 		elog "Using ncurses for video output."
-		myconf="$myconf --with-curses --without-sdl-gfx"
+		myconf+=( --with-curses --without-sdl-gfx )
 	else
 		ewarn "There is no X or sdl or ncurses in USE!"
 		ewarn "Following upstream falling back on ncurses."
-		myconf="$myconf --with-curses --without-sdl-gfx"
+		myconf+=( --with-curses --without-sdl-gfx )
 	fi
 
 	# bug #415787
-	myconf="$myconf --disable-ui"
+	myconf+=(
+		--disable-ui
+		$(use_with capslib caps)
+		--with-zlib
 
-	myconf="$myconf $(use_with capslib caps)"
+		# And explicitly state defaults:
+		--enable-aga
 
-	myconf="$myconf --with-zlib"
+		--enable-autoconfig
+		--enable-scsi-device
+		--enable-cdtv
+		--enable-cd32
 
-	# And explicitly state defaults:
-	myconf="$myconf --enable-aga"
-	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
-	myconf="$myconf --enable-bsdsock"
+		--enable-bsdsock
 
-	econf ${myconf} \
 		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib
+	)
+
+	econf ${myconf[@]}
 }
 
 src_compile() {
@@ -121,15 +143,15 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# The emulator needs to be able to create executable heap
 	# - doesn't need trampoline emulation though.
-	pax-mark me "${ED}/usr/bin/uae"
+	pax-mark me "${ED%/}/usr/bin/uae"
 
 	# Rename it to e-uae
-	mv "${ED}/usr/bin/uae" "${ED}/usr/bin/e-uae"
-	mv "${ED}/usr/bin/readdisk" "${ED}/usr/bin/e-readdisk"
+	mv "${ED%/}"/usr/bin/{,e-}uae || die
+	mv "${ED%/}"/usr/bin/{,e-}readdisk || die
 
 	dodoc docs/* README ChangeLog
 }
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
new file mode 100644
index 000000000000..1a9ebcb408b4
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
@@ -0,0 +1,20 @@
+configure.in:1134: error: required file 'src/libscg.a' not found
+configure.in:1134: error: required file 'src/libschily.a' not found
+
+--- e-uae-0.8.29-WIP4/configure.in
++++ e-uae-0.8.29-WIP4/configure.in
+@@ -1162,13 +1162,7 @@
+         SCSIOBJS="scsiemul.o blkdev.o blkdev-libscg.o"
+         UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
+         NEED_THREAD_SUPPORT=yes
+-        if [[ "$srcdir" != "." ]]; then
+-          AC_CONFIG_LINKS(src/libscg.a:src/libscg.a)
+-          AC_CONFIG_LINKS(src/libschily.a:src/libschily.a)
+-	  UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
+-        else
+-          UAE_LIBS="$UAE_LIBS -L. $SCGLIBS"
+-        fi
++	UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
+       ],
+       [
+         AC_MSG_RESULT(no)
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
new file mode 100644
index 000000000000..7f94dd20d8db
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
@@ -0,0 +1,22 @@
+--- e-uae-0.8.29-WIP4/configure.in
++++ e-uae-0.8.29-WIP4/configure.in
+@@ -624,6 +624,7 @@
+ AC_PATH_XTRA
+ 
+ dnl Check for ncurses
++AC_CHECK_LIB(tinfo, main, HAVE_TINFO_LIB=yes,  HAVE_TINFO_LIB=no)
+ AC_CHECK_LIB(ncurses, waddch, HAVE_NCURSES_LIB=yes, HAVE_NCURSES_LIB=no)
+ 
+ dnl Check for SDL
+@@ -793,7 +794,10 @@
+ 
+ if [[ "x$WANT_NCURSES" = "xyes" ]]; then
+  if [[ "x$HAVE_NCURSES_LIB" = "xyes" ]]; then
+-  GFX_LIBS="-lncurses"
++  if [[ "x$HAVE_TINFO_LIB" = "xyes" ]]; then
++   GFX_LIBS="-ltinfo"
++  fi
++  GFX_LIBS="$GFX_LIBS -lncurses"
+   GFX_CFLAGS=
+   GFX_CPPFLAGS=
+   GFX_DEP=gfx-curses
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 1a9307964684..65b99a1aa76a 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,5 +1,5 @@
 DIST q4wine-1.3.11.tar.bz2 2868845 BLAKE2B 98893b1f65bcb8b8f301d7046a650658a9537849818fddf4803471a626f24d8c812867daec1f167b1fa5cdce9f9c0c50323d715ea06c51f3d52f85904257d2b0 SHA512 95ac66632bc46b10659e1d0e5f3c68b73934a85ddcc6582abd367d28f9949ad0ca732a5596db800bbc76b40ae7cf05fd95febf6d8b44db20cf710c2c1e23288f
 DIST q4wine-1.3.6.tar.bz2 2867547 BLAKE2B b35a638e514108e4ee4be34b446a7d2d5ba00415d8f54cfee293988707b637d41945d3197a2132147e09d5a05153fd47a55701dcba358f3a2b3a2e6037f78aaa SHA512 1ff0ea2a4523fc5582ec67f5e305622653c4e387ac5f2cecde52289117ef879a60261fdbf9ddf421812765539124d4c5b6b37ff401530d3e061723a3c35d57f8
-EBUILD q4wine-1.3.11.ebuild 1200 BLAKE2B fb469ac35923c88f8385d52518d05cc6f6a690e53a788b399ef11a8de0499b9a7b821640b435120b6dd871028a06b3ef4cf1f48a2fb512478fc24d817591fa00 SHA512 32b6adfa756ab4b9d45656b808c64aab15fd7d24280c6f6dbcbfcd3218af4278b6b2eaae14e020b8ce19b8415bbea17e7cba514cbf8347a05ec465dfcd369155
+EBUILD q4wine-1.3.11.ebuild 1199 BLAKE2B c2579c20a853ff30c726cf94778ff0ea77c6127cb5feb1d323133c793bb05ef78b8a0db6ce27bfbf4cc6adc21c33c6ebdc648325ab81f25f7d0be6304046a2d4 SHA512 5a2135eb9baa0787cb7ee6b5d1c15dd9ce4cac3900cf858cb9e9f8f246f266daa61ba8a7f74708e26896f37c6b444d88709d0a2ba7f3ccb4bd34419454fca5b3
 EBUILD q4wine-1.3.6-r1.ebuild 1360 BLAKE2B 1b5be13d28f3292a3ce36263b362cbd51099b51ced181866c5ea7bc88443fd83b561a9794b0ef767b9376ff7a469bb1089d20d9575c53d8938bd9ab4ca12aa3d SHA512 58a1a5adc2f3c3767d0168a78e3e7c90da2827dc630572a5f5b7e5139a6c69c3c6cde15d6328056ab547962d665837bd9364557c284b2aa4442aa033a92591c7
 MISC metadata.xml 641 BLAKE2B af03073e86a430ccc228ba18c2dd18d4fe8d07438e5beec07f3712807a792829096cb3eeaa4e912a80c2634a1bb16ef20ddbc08684fc4fdf2b14d839cd520733 SHA512 707f77ef56bb3bcbe4bda434f1262f77c0b337a8789508e0df04d2cd791959ca7dc67b74ac81b6e248023f3da83c86bcf7f185ca689ab7b3bf346250850df8ed
diff --git a/app-emulation/q4wine/q4wine-1.3.11.ebuild b/app-emulation/q4wine/q4wine-1.3.11.ebuild
index 3466e650c02d..ded8c26b8487 100644
--- a/app-emulation/q4wine/q4wine-1.3.11.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+dbus debug +ico +iso +wineappdb"
 
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index eed521ba556e..ffdc2e148f91 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,5 +1,7 @@
 DIST sen-0.5.1.tar.gz 70930 BLAKE2B 93758076d014a36996ece021f1de2f3ece749453d32554fe79ffec0ab1101bf4cc5c11d80934817fa5b10d73b811e738c87ce8e745a642507ec8406ad2eb59fa SHA512 0faf2c12e6361d3b4e9d093e0830867976a1fbd03cadc7a527c88460244532a8b636d8d4b732bb0c7f4041a0bb0819d20caabe62327b5edbf731b4eb8a4898a6
 DIST sen-0.6.0.tar.gz 55113 BLAKE2B 5f6affbea94005c0adc9ac544d40d94cd9a9eca930b979c19174d21d73fdd887d21802a5241c02ba212a45c4a7873f22c7372aeb69955e1f97e444ef74d91929 SHA512 5573a0d6da5ae395e947bf34c54313e4e3a0251dc1868c52bbfe9ad11463397da83a0c9ac3f1912da2e6f49341c84d40dcab900d41b4a32ebac44d1dde3ac82b
+DIST sen-0.6.1.tar.gz 55357 BLAKE2B 0d58f0ea11eeff29161925018425c918b3260c754d1b658e2ebd3c88e0c371feb0f1815af61979206bee529c369a90ace895d25e645ef0d76c563abd8b74c943 SHA512 2f1cadf745ca7e12d3e92534e76984072b9678055b9911f76b1a6d3cbd43266ad1eeb4d5e7bb8742db91c4da4aef684fa644c33de6fa2494c37688e9747e0efa
 EBUILD sen-0.5.1.ebuild 595 BLAKE2B 76669d2b34f8994b481cc47f24e0fae868c1b596c447bdef2ed1fd51b549247ece387a661b06b1b3debb6aeb710b004d34d31f15d34f7abfb8b83df7e27c939e SHA512 1457afdb838181f49937694888338a855b0bae92e8072454f6b44378cfd4024121ae38e39eb7704ffda2d33df7145e9fdcfc9b3c2d5c30c7b5ba2ed764ffb2fd
 EBUILD sen-0.6.0.ebuild 757 BLAKE2B fa98235b92efc226f21b9c68061e1328a66ec7c5d214bfc80382cb61200ffe603073f1ff6bdfb8393fc7eff248a6c523de27fc8fb24cec7e2c05d4101bc64eba SHA512 7664ee7fde6fb5a5bfb9896dfa494f7ffe668c1da0117257717c4396465a1980721fed350485773553d23314abd6efcfe05ab8099f07ec0e0b07d70d5206891e
+EBUILD sen-0.6.1.ebuild 752 BLAKE2B 74b4795d560d65ad7e74406f8ad093936f22b353b2c20b0d55084f53438f106b52dd388c7a4705a246bcedec7acddf34fb16202ff5a1df44ba2acc66a867a44c SHA512 9bc301833275934d7f9a338cdd5ba38d27894e3545ff85ac667b5ae894d7eed11d8d43ce7fa0197dce88225d3311df008b933cde32cea721fbbbdd9b494e4552
 MISC metadata.xml 598 BLAKE2B 56052c4b881e934c97af30666df9f8364a2fad98fb855122fe22dda5f7b722c642d71440db2a483ee1b0f6afdb20ded677fb3b82ac6e88c8c2f66651e1db2298 SHA512 71e37148c40ccfce6fa1fa80632dd1143eb0462971b7758b724924ffd9739f81c7b341388b22b7b5f0862b266b83bb4adf6ceb95f0997efc4f7f3bd4a8f92910
diff --git a/app-emulation/sen/sen-0.6.1.ebuild b/app-emulation/sen/sen-0.6.1.ebuild
new file mode 100644
index 000000000000..a1159468c541
--- /dev/null
+++ b/app-emulation/sen/sen-0.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal User Interface for docker engine"
+HOMEPAGE="https://github.com/TomasTomecek/sen"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
+	dev-python/docker-py[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flexmock[${PYTHON_USEDEP}]
+	)
+	"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
+
+python_test() {
+	pytest -vv tests || die "pytest failed"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 140e6f0d83ed..657e408e976f 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -19,7 +19,8 @@ EBUILD wine-staging-3.21.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d7
 EBUILD wine-staging-4.0.ebuild 20086 BLAKE2B 18f862a45df2bfa7a2b428e48cd028e48905127beccbd0d5b80fbb999720f9efe98f6e5c4022d18b5de5d4e0b28f9db07b5ba7b25a816fc7fa049236304556b2 SHA512 da9f41dd2faca0e65e4d69e0ebb77c6f348c12568e8bf3fda4effa3e62c75a5bb2415720f492cd86e03d04135815ece6cd1859d2b81da52d8d07ec0ac7c5e58d
 EBUILD wine-staging-4.1.ebuild 20052 BLAKE2B eaf777d9096603570177c0839926a2ad7ff40e579c479e13a7639e3fbe39c44a89dc1e04a5eb4cdf07f569c9451ed6c016977ac8a23cf4638cbb9afeecf1022c SHA512 9b4a0dc664ba6f48c24f453d4f74be7f2378fa2c727334e258c7e9ffbc2e92a5f66d72325e60073c9a8f84043bdb42aabc7c3afd48d4daa1d41832f4e855f405
 EBUILD wine-staging-4.2.ebuild 20048 BLAKE2B e06b98c8aa8b02a50336f91a946e4f138618d455379bf2a86c1fb228f61d5a912bc38ebecf0b506637e539f7f4313974602979ebdab115e99ac4a4b2561e75c1 SHA512 2637064739be6cfdc3b32864b190acf4b52eca789fc6e4a810f80f0fbfa77a15dbb69daa3d7f2c07c6dec6e6b6016ffbdf948e72de9e5d61a04060761bf1577d
-EBUILD wine-staging-4.3.ebuild 20132 BLAKE2B 90871535471b596150bb5e5ded724d61558fe2f9e938ca691dbb8b5001d576749c3130a2119294e6a953626d0a51ff26080d8baa798765cbd1366e0ebb0d35ab SHA512 f195674a6977ba52bdea0a015f8ee1e8df5836870057c2ec4a5a1c683d7b58056a0d2460e9fa7637097c5d0962ac8e18239f048dd52a1b72acd4ee48fe570cb7
-EBUILD wine-staging-4.4.ebuild 20129 BLAKE2B a77bab89cf1d863e1f75a8aae1a1dab18206ab1a380ed2c567340b79e705a84f0a79d9f7a6a1cf20aa99e344db177393b78da077c5ef4502366b474f3a7b7bb9 SHA512 cefe09b1b9ab4cddf8f336e178260959cba1a9e6033c31873648e40107e021afa0f05d3cff71256d511651804e9223544dccabc278128b8848c9c2d3b4e8dec7
-EBUILD wine-staging-9999.ebuild 20129 BLAKE2B a77bab89cf1d863e1f75a8aae1a1dab18206ab1a380ed2c567340b79e705a84f0a79d9f7a6a1cf20aa99e344db177393b78da077c5ef4502366b474f3a7b7bb9 SHA512 cefe09b1b9ab4cddf8f336e178260959cba1a9e6033c31873648e40107e021afa0f05d3cff71256d511651804e9223544dccabc278128b8848c9c2d3b4e8dec7
+EBUILD wine-staging-4.3.ebuild 20132 BLAKE2B 257bf692e52894261a57fdc114190ef92438c67838614cb1e4beae0a83cc453c9f512e275d442e56bbeb66175d95cdc22b2e9e56338685cc09ad5a41cfc826be SHA512 c33bf8bab47d6cea67607128c9b6513fadf4f843320f77c1216b1339f96000c0ea2bbd0d127b2c55e105ea039f28fcc04a56dd5ccc3bba2c815e8ea46e477c18
+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-9999.ebuild 20280 BLAKE2B bb9251fe89e9663b2301d60390af94452e518edb583493271531e765f78a03b6febc09a95fe53ef8c2dbd3a1f1448c0984603fbec24b3a975a820a564f9743cd SHA512 add579ceb72dfefa06d6664391a80cb7a1db98a54854e642d55ab1365d7420d63d3a9a4c599629f0c59aebe5378a44d20a4eea2b4eff7d2df4223ec78e1bccb6
 MISC metadata.xml 3726 BLAKE2B 77d0abd355f8c85069f843cccaf16c0c0afe4ea4dc29f6d9111d7127685dfa9dd8e668b7413bac2a1aec2228da7880f72c601eb9f1525e8bc09bab330524863d SHA512 2b732c0519d7d01d0023457e8eb8aa05f06465f3479fa3093712c0ebe25ea103322e19be57cdea2c8df19da42fc29620a8989cfa77719f0f49b7aaa0bded073c
diff --git a/app-emulation/wine-staging/wine-staging-4.3.ebuild b/app-emulation/wine-staging/wine-staging-4.3.ebuild
index 2fd365b4cac3..39c75fcbf87d 100644
--- a/app-emulation/wine-staging/wine-staging-4.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.3.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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
new file mode 100644
index 000000000000..1fa673641c44
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20190316"
+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
+"
+
+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"
+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
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	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}] )
+	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}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	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}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!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 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	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
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+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}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+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
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+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
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	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"
+		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"
+		(
+			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
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(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)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(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
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	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}
+
+	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
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# 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
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+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
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-4.4.ebuild b/app-emulation/wine-staging/wine-staging-4.4.ebuild
index 9e905f61e25d..b12f4ca1e78a 100644
--- a/app-emulation/wine-staging/wine-staging-4.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.4.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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 9e905f61e25d..1fa673641c44 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -44,7 +44,7 @@ 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 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"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -356,6 +356,7 @@ 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"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 9e05df20ebf0..3cff85b758fb 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -16,7 +16,7 @@ EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4
 EBUILD wine-vanilla-4.0.ebuild 17341 BLAKE2B bdb219c3352300bfa6bf2194696ed44a4632170ae6c03c938203c57b9b6aa23c5de2276a42bc9943dfbcbc942214fcdeb7a313deebf25c9b8570c3fe51c9bc8e SHA512 65e06fc637ec397e3365d7be2e58b130852675a93ea235e6066e01f9e5b7efd098868fdc1c3fce810dd72dd1c0e66bab9a4941b7f3a1ceff40a744776cb91055
 EBUILD wine-vanilla-4.1.ebuild 17311 BLAKE2B 55106a1bc3703f647d3d4119e14aa45b6655e8b9e800dc72dad77f25fdb60e2b10845098030986bc0c6c7649dc1c40f3b67bb74d184110891717b2f00abff49a SHA512 12eee5f6a461476802cacf7253b93d53b6e76c5cc2062c373ecd3845fede2ea4549074997549266e5b71636706d5d50fe5e57060046041489deb9134c5b0495e
 EBUILD wine-vanilla-4.2.ebuild 17311 BLAKE2B 55106a1bc3703f647d3d4119e14aa45b6655e8b9e800dc72dad77f25fdb60e2b10845098030986bc0c6c7649dc1c40f3b67bb74d184110891717b2f00abff49a SHA512 12eee5f6a461476802cacf7253b93d53b6e76c5cc2062c373ecd3845fede2ea4549074997549266e5b71636706d5d50fe5e57060046041489deb9134c5b0495e
-EBUILD wine-vanilla-4.3.ebuild 17395 BLAKE2B f71df5ceb17a1c01e6e2e0c2251e9d69dea54a8bf277740ba4c6267bedd655bb7e37196622c83be17432ad4d1ae907a61dace0210b4559e93cf2fa87c0ea8ff6 SHA512 4ed4915ec3b577c9eff884289dbddbf77d8b65f3afe09438cc8ecd9ffb73c8738946e6ad53184db0a26a6e6ccdf19bf643dc7272cac86664e23d917c961ef5f0
-EBUILD wine-vanilla-4.4.ebuild 17388 BLAKE2B 9c94eb8e9abe44affab51ef71143d4292af3bbc077f860879fbc44f43be84af775ff276d34a509da57b09f14705948433c33f0f76f7482028fbcd86c42ae12bd SHA512 fb65ac21807aa3f46f83569658907fb0be01bf579bd598fabce37ac071f48d2bd27c3badcdca6ea4221ba373eccaa0600b00b19aa2bf2252341a54086ee57dc3
-EBUILD wine-vanilla-9999.ebuild 17388 BLAKE2B 9c94eb8e9abe44affab51ef71143d4292af3bbc077f860879fbc44f43be84af775ff276d34a509da57b09f14705948433c33f0f76f7482028fbcd86c42ae12bd SHA512 fb65ac21807aa3f46f83569658907fb0be01bf579bd598fabce37ac071f48d2bd27c3badcdca6ea4221ba373eccaa0600b00b19aa2bf2252341a54086ee57dc3
+EBUILD wine-vanilla-4.3.ebuild 17395 BLAKE2B edb4f1c9a2929010da9ac4477dbfd573869fb208b21aafd6864343f814013c70f8c72b76a55fa52c5798b6661595b0764c26c2ae0a505514171dd01943b5decd SHA512 4bab3ef13a187c6dac7cf2b9b683aa26e1bf8290cf1bf21db3a2b1b4cca10b53de169f5c4443aa665b07edf314a5e9e6e5c361c864818cc268a3e4c0004340f6
+EBUILD wine-vanilla-4.4.ebuild 17388 BLAKE2B 0c48871fe460ccd760330f3c380ed0307cdb093a1319a8fff239b552b78a17789320e2fd19d8dfbd32282f6a2926f0545b37f4df9dd5bb9d897dac0f5c8f1210 SHA512 acc0d5ef46f73a50aba5e9d8bf54513a769265af38f52289842a0122d64f93309654e76a5e5f618fa6396c2455edf939c4545e9199d14cf2d75371bf29af6ffe
+EBUILD wine-vanilla-9999.ebuild 17388 BLAKE2B 0c48871fe460ccd760330f3c380ed0307cdb093a1319a8fff239b552b78a17789320e2fd19d8dfbd32282f6a2926f0545b37f4df9dd5bb9d897dac0f5c8f1210 SHA512 acc0d5ef46f73a50aba5e9d8bf54513a769265af38f52289842a0122d64f93309654e76a5e5f618fa6396c2455edf939c4545e9199d14cf2d75371bf29af6ffe
 MISC metadata.xml 3273 BLAKE2B 1a060f5a0877c948b46a7fa128e265b682c3a367651629454a38114a112c4d43faeb53dfc335f10e84635fac6adf50f8b9429f060252e11191dfabee031dc81d SHA512 151c4e3b2039180194e6d50983ec4d298296810b2ad794b06a4189e07d0b4800afa4ff62a9b3133bbf04b02644da9938b6f5139fecb332f2dcf955f9e3f34faa
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
index 6397e0c6edf6..8661edf7b9a4 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.3.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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
index fbc64fd1e689..88c369249e60 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.4.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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index fbc64fd1e689..88c369249e60 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.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.7.5 )
+	mono? ( app-emulation/wine-mono:4.8.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple