gentoo auto-resync : 10:08:2023 - 15:32:40

4 files changed, 31 insertions, 14 deletions

diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 97cf15989456..2125941a075d 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -7,7 +7,7 @@ AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae14424
 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147 SHA512 5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
-EBUILD wine-proton-7.0.6.ebuild 10798 BLAKE2B 5511bfe5386ea33af4b76c1a9d58e630c8c2cdbe39a64e8305e9c859f6e850032474992beebfc82023a7c263d443162ed5e39cb4294670a4d052506e8caa429f SHA512 87659fbfe50e34eae90aaab12880f7509386d4dd5c77e0672de92e3b1950eca54536451cb1174fc317f20e27b700b888e6f8d39107627f216a49744ef36bf2bf
-EBUILD wine-proton-8.0.3c.ebuild 10936 BLAKE2B abccff09f367e67b8117c8ebe0d04efa420c96945c1c190c3cb6673f76127eebd0ba8893b2f8e24f7062da4b3a135f6b8677d8dea7c6048f997225534870ae30 SHA512 d14b893fdb1dafe42b2011aa4aa56db94ef0b0dab2892431fbfd4ccb1a24461f40af6f6ae1fcbf32e8b9748b2fad15b54921f56b551f033687aca6a2bc8e06e2
-EBUILD wine-proton-8.0.9999.ebuild 10996 BLAKE2B 00f2707f7f211f9dbf7dc47ccb18b714a0e3980fbe04ce6eb12a2afcf32dcab4153f345df5d2e1c1f844ce38171fdd42b01ea202134565c4df0aab73bc0e578f SHA512 f2f2ddd91b94bd7dddbc8cbf9b4e4a672c584ffc34ad3e8fd67d5ce49bda050477487a81cb94fdcae2a39ce913faaffb13127f57de2e7d9cfc2c4a898ed82765
+EBUILD wine-proton-7.0.6.ebuild 10957 BLAKE2B 42161cb65325f6cb0c129055c58301efbd7f38151958809289d269053c0573c60e11ce8ff6a393c87e39e31c737a3c92a2984b322e1178ac6f8e51e9913fe735 SHA512 6447856a8664212ed1ec7ca068f94b3003e5790f730db5703ec10bdfade5f8ad6e48de85c6e1e80a7cc6ce91b548b81fdadeb26d8312e8ba50aee8680584f0ac
+EBUILD wine-proton-8.0.3c.ebuild 11215 BLAKE2B 8712763fbb60efb62860a0511ab50b412466037cb4a888abc8d8aff1114bcca07ea6c98a8e6e59cdd048b2f9c352d8ec2a86b54a87942f9af3eb9d5167458e1d SHA512 472139158349310af399ddbeaf975d1b668a14b7779022fdcbbd22ed4e44ac0eeca86e348bec617a7fcacbb170af652fb58862ab4897014b3da2c6b8d67cb78a
+EBUILD wine-proton-8.0.9999.ebuild 11275 BLAKE2B 2cc71b94cf649b3bc4cd4873ecb6bd7c4aa4d15235a26b5524f4cf70d284cb426e2914f1fe80b7584b80e4ee15afd63575cdbf3108f5c5a49f15b4fed1286a16 SHA512 04d9ec9711121a3e8b59a65144cf9e5de1210cff551a55c517d936bb4d0cd529f0e9c93811fa777caf238b2948a41bb534bf5e0ed69bc23680e0f4bf9cd61a5c
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 086837096042..294e5c9aab65 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
@@ -158,6 +158,9 @@ src_prepare() {
 	# similarly to staging, append to `wine --version` for identification
 	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
 	# always update for patches (including user's wrt #432348)
 	eautoreconf
 	tools/make_requests || die # perl
@@ -263,7 +266,7 @@ src_configure() {
 			# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 			# crashes with -march=skylake >=wine-8.10, similar issues with
 			# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-			append-cflags -mno-avx
+			use custom-cflags || append-cflags -mno-avx
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
 		: "${CROSSLDFLAGS:=$(
 			filter-flags '-fuse-ld=*'
diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index e5ff1bbe7cce..3f2ba5ab1d26 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.4.1
@@ -155,6 +155,9 @@ src_prepare() {
 	# similarly to staging, append to `wine --version` for identification
 	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
 	# always update for patches (including user's wrt #432348)
 	eautoreconf
 	tools/make_requests || die # perl
@@ -215,7 +218,11 @@ src_configure() {
 		$(use_with xinerama)
 	)
 
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	# builds with non-bfd but broken at runtime (bug #867097)
+	# TODO: retest mold and lld, and figure out what's wrong if
+	# still broken given (at least) lld is supposed to work
+	tc-ld-force-bfd
+
 	filter-lto # build failure
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
@@ -265,7 +272,7 @@ src_configure() {
 			# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 			# crashes with -march=skylake >=wine-8.10, similar issues with
 			# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-			append-cflags -mno-avx
+			use custom-cflags || append-cflags -mno-avx
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
 		: "${CROSSLDFLAGS:=$(
 			filter-flags '-fuse-ld=*'
diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
index d44d6d421587..68a943a8042e 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=8.0.0
@@ -155,6 +155,9 @@ src_prepare() {
 	# similarly to staging, append to `wine --version` for identification
 	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
 	# always update for patches (including user's wrt #432348)
 	eautoreconf
 	tools/make_requests || die # perl
@@ -217,7 +220,11 @@ src_configure() {
 		--without-vosk # unpackaged, file a bug if you need this
 	)
 
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	# builds with non-bfd but broken at runtime (bug #867097)
+	# TODO: retest mold and lld, and figure out what's wrong if
+	# still broken given (at least) lld is supposed to work
+	tc-ld-force-bfd
+
 	filter-lto # build failure
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
@@ -267,7 +274,7 @@ src_configure() {
 			# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 			# crashes with -march=skylake >=wine-8.10, similar issues with
 			# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-			append-cflags -mno-avx
+			use custom-cflags || append-cflags -mno-avx
 			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
 		: "${CROSSLDFLAGS:=$(
 			filter-flags '-fuse-ld=*'