gentoo resync : 02.06.2019

2 files changed, 9 insertions, 8 deletions

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3b8daa118f63..16a551bc887e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,19 +8,19 @@ DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a
 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.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-4.9.tar.xz 22077528 BLAKE2B 98cf186152abc8379275b353e3934efc285cc386f33188a283e3568f803090057bcc90da6dd6c6c1e9d7dbbcf61fbe4a2316107ff129a7d7baa174982f9dcf26 SHA512 bf750af9569b0c564cd9581b9de8c399f6e42227eb6e79338ec6ba70f135fe3388b0792ff013add97341c488ed906227cdf93cc275e362ba232df78afaaab66d
 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.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 17450 BLAKE2B 161e709bb04d61fb6f9eba1ada3a602210c9836f68db1106a39f83a14e603aa039f3a46a468027297d6d00d5fd007b9c5f119c9bd69f796099c32600c3aa1d00 SHA512 ec40c999dfb76bd2706525cf6a08b4d8305ed9105b3a5374cf48ed23b41f78cc5958a041125302d4626fd17277ea82f658cccb8d1b4a34d74148222b9634c456
 EBUILD wine-vanilla-4.8.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
+EBUILD wine-vanilla-4.9.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/wine-vanilla-4.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
index b1a8313b6930..70c9c99fce97 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.9.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="20190316"
+GWP_V="20190511"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -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.8.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -139,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=()
@@ -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)