gentoo resync : 28.04.2021

6 files changed, 37 insertions, 43 deletions

diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2427c9c66acd..ee74ea7e3896 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,15 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
-DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
-DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
-DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
 DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd6534a550e9365ea9ab773d81283520ca6b0efc8aa69063cdeae8da35fc22e08a40c73c6268db4d57b0442ad2 SHA512 f190e1b97defb4620e33d1a4e2afffd475f6b3998153c67c6d06840b4f3b93a50f88c6844de15e7f54ca712330f6fea857310861a78b961feb7f64a4869f3fe1
-DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f
-DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e
-DIST wine-staging-6.3.tar.gz 9796930 BLAKE2B b24e5ec57435a0d797e4d913b027226b3c891477d9df5d098be52348dff4eb704275c7c59d09f6cbdf7f86940a0e6c96bf28f94bd703fd32d6770a31426043fc SHA512 ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2
+DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4
+DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
+DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4e2ef0b78868fc87df6a8a5789004fa5173987a04f4c3f8b51ab70d0c4b573c2ce867765b7009346790dcca6824347 SHA512 9229ff6f56120c64cf79d2b817ce2e1f43f1f02e77356f7d371104a4d8a6455a090555ad80b0efd18f69edd019a2caac7bdf59aaba097ac01d311dac927e48b5
-EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
-EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
-EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
-EBUILD wine-staging-6.4.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
-EBUILD wine-staging-9999.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
+DIST wine-staging-6.5.tar.gz 9743825 BLAKE2B 606377c33a789e092f044bb610746e54fba77a9af0e3da674d16c8ce0f51c59d82f78f0e63c5915fb6f1ab10d6ee91d7b95a7634f1177a6455de6e0c0517ef01 SHA512 bb5199419a22a4536ff95fb0e6257d7c870fe79f40346d56101579edae5c44086fac0db975e04452fcc1d7cda0d5392ff703e1c39504ec4ee63610e2e89fd1e1
+DIST wine-staging-6.6.tar.gz 9756871 BLAKE2B 45e49f7cd2820e027cf9788e7257a3fdaeb97d711d8ae4b466026316f331c2ad84aa0f8446cbeacb98c280e21bd1666d23054bcbc7702533e4974148e684be91 SHA512 65e90c4a0965f2db499edcff5171552b8e95716ff9b2a4ed272d022bc0b1f99547ca1d7b09ced2a267cdf3dfbaf552f9cbb2cc8bbd34636eb3882406ab5985d2
+DIST wine-staging-6.7.tar.gz 9722531 BLAKE2B 1df164ea23808f40baddbbe30ed92125563c3c952e13817ddea124cf780a397237e70aa48532d5b49c8b80919122a09e579f1928a13b6d17329d51f0ba03da74 SHA512 74805846e2e6e5d751c25f4b98ac671f8507d3a9b13d572e166b1885e397a6bb74bd3ea4b456d46298306d632499a4b88f97eb6d53ff049c2495cf055347611d
+EBUILD wine-staging-6.4.ebuild 21988 BLAKE2B 3ddadace2bc48c8f2dc755eae43372f389b3d6338be3c253dacf31c0bd4e87470d189aa164dce0e9a67bf326a78189c9e616db7f4ae19fc1858978bd07d0d2f3 SHA512 a211d6169167d3135dfa8b0bb94ca20d8830ddbcddedab4118aa13c1a3a86338bfb6ecb9fc7fa5973a100ccdff2bc972e88143b20b7184f234f528d27ca93124
+EBUILD wine-staging-6.5.ebuild 21988 BLAKE2B 3ddadace2bc48c8f2dc755eae43372f389b3d6338be3c253dacf31c0bd4e87470d189aa164dce0e9a67bf326a78189c9e616db7f4ae19fc1858978bd07d0d2f3 SHA512 a211d6169167d3135dfa8b0bb94ca20d8830ddbcddedab4118aa13c1a3a86338bfb6ecb9fc7fa5973a100ccdff2bc972e88143b20b7184f234f528d27ca93124
+EBUILD wine-staging-6.6.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
+EBUILD wine-staging-6.7.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
+EBUILD wine-staging-9999.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.4.ebuild b/app-emulation/wine-staging/wine-staging-6.4.ebuild
index f88a6cd506be..6641dfc2f349 100644
--- a/app-emulation/wine-staging/wine-staging-6.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@@ -559,7 +559,7 @@ multilib_src_test() {
 		fi
 
 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }
 
diff --git a/app-emulation/wine-staging/wine-staging-6.2.ebuild b/app-emulation/wine-staging/wine-staging-6.5.ebuild
index 0d4d6cdf1e7b..6641dfc2f349 100644
--- a/app-emulation/wine-staging/wine-staging-6.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.5.ebuild
@@ -16,12 +16,13 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@@ -180,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 fi
 
 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
@@ -560,7 +559,7 @@ multilib_src_test() {
 		fi
 
 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }
 
diff --git a/app-emulation/wine-staging/wine-staging-6.1.ebuild b/app-emulation/wine-staging/wine-staging-6.6.ebuild
index 954abe1eca77..20eb02bc907b 100644
--- a/app-emulation/wine-staging/wine-staging-6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.6.ebuild
@@ -16,12 +16,13 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@@ -133,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -180,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 fi
 
 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
@@ -560,7 +559,7 @@ multilib_src_test() {
 		fi
 
 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }
 
diff --git a/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-6.7.ebuild
index dd1fc435646a..20eb02bc907b 100644
--- a/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.7.ebuild
@@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210302"
+GWP_V="20200523"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -172,7 +172,6 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-	"${PATCHDIR}/patches/${MY_PN}-6.3-Fix-nine.patch"
 )
 PATCHES_BIN=()
 
@@ -182,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 fi
 
 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
@@ -562,7 +559,7 @@ multilib_src_test() {
 		fi
 
 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }
 
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index f88a6cd506be..20eb02bc907b 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -559,7 +559,7 @@ multilib_src_test() {
 		fi
 
 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }