gentoo auto-resync : 11:08:2023 - 15:35:17

8 files changed, 119 insertions, 27 deletions

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 4959a7eb8157..07122a05a101 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,11 +8,11 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.11.tar.xz 29236492 BLAKE2B db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5 SHA512 f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869 SHA512 6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240 SHA512 952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-EBUILD wine-vanilla-7.0.2.ebuild 10967 BLAKE2B bb7d128114fe10630ad356de3be55ec24efcb23b78d07de69ac2bca936dd16ea6a8846d1abd2a878ce989eec8a13b31504f74a9cd9de8a3ceab796845f063140 SHA512 c3ae177905e552f1d83bdc298d8f1fe36812ee11352e27998861eb7e92aa8acf52de5576c42700fd803b10747f1c3f14357e394a2f6fac49d867337a131e9d27
-EBUILD wine-vanilla-8.0.1.ebuild 10985 BLAKE2B 7b93e79599ebcf73c6fc743ffd3fe883e495505627ee77ebce11cd2b726503c3668dbe49483378fcb6918f1698e5bd4f59ab48c270564877fe56288c4482cbe0 SHA512 d5a2df24f0102283086831bd3eac762f5d8d0d6e3b784f3648b383a98c2346c324f09d851b20ce5ad9f21487a3a720cb6f049b1437186e80e24fbec3ad581a50
-EBUILD wine-vanilla-8.0.2.ebuild 11058 BLAKE2B fca4c342cb39cb6a234bd10ea3aff0f9cbcef5f1c722de81df06a8817a85f94e0d101e5f0f3d5b9a7cd6b192e8c6d3ca5b116e0cee000e7955ea1b2f16bf2b07 SHA512 347ca915d58921acbbb737960895b320989fa97db54a74d4342a3862f9d4ae086032887d74ab8e55acd4927a2a62fd4521e5dfe354d63ceab08ca2da9d138875
-EBUILD wine-vanilla-8.11-r1.ebuild 11168 BLAKE2B aa9617531bb05bc9fc27881772062da0982ece732a269adcb7b09a31b9e63ffef84bf795c10a34d1475d7a3c52910bd0012652bb2f4875365b0fb0d8e853984a SHA512 fb6cf93d21420a893a20d5738a4f57e9530eeb7af4a2080667b29820a8d1a1f87e3f48075b90e3ed4705eaf65af72e5982a6300579fe321d1f34e15d4e5e40c2
-EBUILD wine-vanilla-8.12.ebuild 11168 BLAKE2B aa9617531bb05bc9fc27881772062da0982ece732a269adcb7b09a31b9e63ffef84bf795c10a34d1475d7a3c52910bd0012652bb2f4875365b0fb0d8e853984a SHA512 fb6cf93d21420a893a20d5738a4f57e9530eeb7af4a2080667b29820a8d1a1f87e3f48075b90e3ed4705eaf65af72e5982a6300579fe321d1f34e15d4e5e40c2
-EBUILD wine-vanilla-8.13.ebuild 12173 BLAKE2B a82f88b539caa45a6d0e4f16131a73719628a7a62e528edbd6736d3ce3a49d316b40dfdfbeab508d708b4106d1658d4f9dbebf9e12196e43d74eefcaadd74a0b SHA512 c70426d2dc0b158eb2277d13376a49d6793934fa0d7e5256ad7fc6742427ab7d463514a80b3b4613d0fed46a1a5346487d2efe369772f6a56b6920979dbd60cd
-EBUILD wine-vanilla-9999.ebuild 12173 BLAKE2B a82f88b539caa45a6d0e4f16131a73719628a7a62e528edbd6736d3ce3a49d316b40dfdfbeab508d708b4106d1658d4f9dbebf9e12196e43d74eefcaadd74a0b SHA512 c70426d2dc0b158eb2277d13376a49d6793934fa0d7e5256ad7fc6742427ab7d463514a80b3b4613d0fed46a1a5346487d2efe369772f6a56b6920979dbd60cd
+EBUILD wine-vanilla-7.0.2.ebuild 11411 BLAKE2B 0c40971c222e9f87e4326eed3d2e11e53eabed656313d349303032cd0c49aaae11da67f2c990940fd2f6253c23279ed6f866420350a95d8981871d23b3fdea48 SHA512 f3ca6507b5f7855a4c63e719d0d5e5c735330e071e968b1de2a0903f8a243a2d739d2c4aabf962c60216928116374b0fb5b35fc0d0c75d65c626a803b6f9a234
+EBUILD wine-vanilla-8.0.1.ebuild 11429 BLAKE2B 794d23ded61df53a29351bd4139e255dae675b52e796c945138c0be109d259a88a21d3d7d77a228d69c54fae38b405b608768cb4bf949855c58d83712ee6c8a6 SHA512 2d00ea182084ef6260f9acf69090cc6a49f1b4e0a769acb59136e17fb91b7a6cb40059781b368650df75bf7705537a9a1e0d10f31af5adbcae13cc2377fcf0a1
+EBUILD wine-vanilla-8.0.2.ebuild 11502 BLAKE2B 6d551bedada83a40a50f44b76e0c86dabcb68d65f944c4fdd12dfd8a735930b5ef8070ce43b3317e9d54ee0841ce0e3ed451034a02e6999414a4a360c7cb9b78 SHA512 77de2406868a80147880879d6508d2bafa4c106b18a5f18faaf95720928d7d72b621e4e553926edd4e9ed33e4ab681a6e6cf10ebe2840c3662708a3d8970f384
+EBUILD wine-vanilla-8.11-r1.ebuild 11612 BLAKE2B dc5688e33c28adfe9396b372167acb4137a2450b0442fa0f5c5bdb238c633aa75ab6453cb9d8962decb8f25b15fbd4ff22957b15aaebb49919dff13be165134e SHA512 d80656c35faa26f0277870c9f72b23390d61cb31c1e1cbc5e17ddc2029dcaf4de469af3e9782485e9a3845ed9a975f9400e4ecb04c059565e6630ffb1bca0846
+EBUILD wine-vanilla-8.12.ebuild 11612 BLAKE2B dc5688e33c28adfe9396b372167acb4137a2450b0442fa0f5c5bdb238c633aa75ab6453cb9d8962decb8f25b15fbd4ff22957b15aaebb49919dff13be165134e SHA512 d80656c35faa26f0277870c9f72b23390d61cb31c1e1cbc5e17ddc2029dcaf4de469af3e9782485e9a3845ed9a975f9400e4ecb04c059565e6630ffb1bca0846
+EBUILD wine-vanilla-8.13.ebuild 12678 BLAKE2B dfadfc8f91acdc57f44d5a94caee5397367e0c7692f0fd1402eb2df2ad969eabef8ce2afc7b5567a5b82402aca9a6d6c01b3600340cda08e287da4e3bf7bd6a8 SHA512 b58e8dabaa207a8a7161cdd18ce4ce310da339438d1fea7809a4c2192a6cd935f081867c362dc291222d30076d97846b8fef72032e9a2e52a1794537bb2c97f1
+EBUILD wine-vanilla-9999.ebuild 12678 BLAKE2B dfadfc8f91acdc57f44d5a94caee5397367e0c7692f0fd1402eb2df2ad969eabef8ce2afc7b5567a5b82402aca9a6d6c01b3600340cda08e287da4e3bf7bd6a8 SHA512 b58e8dabaa207a8a7161cdd18ce4ce310da339438d1fea7809a4c2192a6cd935f081867c362dc291222d30076d97846b8fef72032e9a2e52a1794537bb2c97f1
 MISC metadata.xml 2605 BLAKE2B 11bdcd81e6e4620229177026a6eea5bbbff4f2f8c92deabd08d096bd1ffab0bea06f950fe4631f227bb31dcf22e9d41456803a3924c0cf934c5d7b28aa7f0308 SHA512 e96b8ab85a6b124ae154b514b8dd9385158b999f7ffbd0a1e04d9bbb52288cd07b81a2fe989431ac214fc0ae37445e2c819b6593d31001fa54b0aa6f48561e8a
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 31bb2a4e7fdf..eee523c84dde 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -171,6 +171,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
index 289ad34feeb6..aed49df3605b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -169,6 +169,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index b8679687d7f1..ca24322d73fc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -169,6 +169,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
index 28ee8cb167cc..9573a0a88c0b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
@@ -173,6 +173,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
index 28ee8cb167cc..9573a0a88c0b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
@@ -173,6 +173,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index 9f0672c16b6e..8eec4853243e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 
@@ -124,8 +125,11 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
 	dev-lang/perl
-	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -181,6 +185,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
@@ -244,18 +260,18 @@ src_configure() {
 		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
-	# 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
 
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
 
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 9f0672c16b6e..8eec4853243e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 
@@ -124,8 +125,11 @@ DEPEND="
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
 	dev-lang/perl
-	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -181,6 +185,18 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# and it still gets used in install phase despite USE=mingw,
+			# drop as a quick fix for now which hopefully should be safe
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# ./configure will abort looking for -mabi=ms, so do it early
+			die "building ${PN} with clang requires USE=mingw to be enabled"
+		fi
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
@@ -244,18 +260,18 @@ src_configure() {
 		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
-	# 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
 
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
 
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}