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

6 files changed, 93 insertions, 25 deletions

diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index e326797085db..ea9695bf4b30 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,9 +9,9 @@ DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f SHA512 fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2 SHA512 11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1 SHA512 b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
-EBUILD wine-staging-8.0.ebuild 11924 BLAKE2B 0e4562181251cd9844b940bb43dfa010e1867417086102b67be02492d1f28a579cd6b4c075de2cd00ccac65d2e69b451f95f17ba5559f581e57cbf8869a37bea SHA512 404a62047ff77551065f9109ad43c301f65744f07b33fbbfdd8cfe3a172a92956ab4d313ab2ddef1e1bfd00b39f3f4fd92dc308783ee1c6e5f221beabd28d5f4
-EBUILD wine-staging-8.11-r1.ebuild 12235 BLAKE2B f4b5947c95e11e2bfcb20c4c52e859501a8ceff4369ac52af4ab41829530c8ad98b07000e01285e6b53665a08c30828f294e743261526faeffa7022b44aefc4b SHA512 b9b009b867264879549a6d8bce9ef3da3b64bfbe61536ca3a6e17a547047ef3bcf448b7b9efc6524c1c6b02b77d0009ad8d6c18e2d52b851f80575f3f504f536
-EBUILD wine-staging-8.12.ebuild 12235 BLAKE2B f4b5947c95e11e2bfcb20c4c52e859501a8ceff4369ac52af4ab41829530c8ad98b07000e01285e6b53665a08c30828f294e743261526faeffa7022b44aefc4b SHA512 b9b009b867264879549a6d8bce9ef3da3b64bfbe61536ca3a6e17a547047ef3bcf448b7b9efc6524c1c6b02b77d0009ad8d6c18e2d52b851f80575f3f504f536
-EBUILD wine-staging-8.13.ebuild 13240 BLAKE2B 771571ba19aed269fe64ffd9c59b431aee97059c68168e9b4bed03425c355892293404885f4ec62122b2bf9772c86b10af7fda2d28961c166dba2fcbdf118155 SHA512 fad252e72f69a7f151786a997bd7a87c11e9a81db4d174ceb7d7907c2f30694e4bc20729f066ea8717a097956ae5e6d4039e555e3a0f7be4b8ecd15fd310cc08
-EBUILD wine-staging-9999.ebuild 13240 BLAKE2B 771571ba19aed269fe64ffd9c59b431aee97059c68168e9b4bed03425c355892293404885f4ec62122b2bf9772c86b10af7fda2d28961c166dba2fcbdf118155 SHA512 fad252e72f69a7f151786a997bd7a87c11e9a81db4d174ceb7d7907c2f30694e4bc20729f066ea8717a097956ae5e6d4039e555e3a0f7be4b8ecd15fd310cc08
+EBUILD wine-staging-8.0.ebuild 12368 BLAKE2B 499087cf6caf1dc87607c93824b08274046defcf33f86279d7c47579ae9b2c9911bca2edefcffc2ff8305061685189d41c5ee4a1619f5c9f341daaaf4ae7720b SHA512 43dc6e883dd7a6586d6dfedcd128d5c43f64c1f7365728b2381e6106e673883383fcb66ae2304663487f7262d71b553605dfdf164b2a290879a911cc7cd9a374
+EBUILD wine-staging-8.11-r1.ebuild 12679 BLAKE2B 6a212b78a2a8a4394c2ccb96b795eb0913323f189a1758bc9f8165f6a54b41b90a3ff054f6d0fbaa6030ff2131d3bb5cec1ffdab8bb33a8062f46db9f8f21410 SHA512 22a53994cdbfe3e0627e1f15ac2995048cfdb90197429d0d5529354bc051db166d086e583d68713a198a0134182bdfbe6fba66ff3bf147f12f63cd495fe01fe2
+EBUILD wine-staging-8.12.ebuild 12679 BLAKE2B 6a212b78a2a8a4394c2ccb96b795eb0913323f189a1758bc9f8165f6a54b41b90a3ff054f6d0fbaa6030ff2131d3bb5cec1ffdab8bb33a8062f46db9f8f21410 SHA512 22a53994cdbfe3e0627e1f15ac2995048cfdb90197429d0d5529354bc051db166d086e583d68713a198a0134182bdfbe6fba66ff3bf147f12f63cd495fe01fe2
+EBUILD wine-staging-8.13.ebuild 13745 BLAKE2B ab12fda76bb7c6fb1caaea88d06e42899303766f7c2c6221c653123fe22385840d2f00dac0bb46c129fb9310fba0497ee27628bc248be87aeb542eb5c473e690 SHA512 cd4ea13ce79f8a95ef0ce1e585270958874d7fbdc5740cbd1ea680daa7d31c44002f085f22ac08bd00345e029e3c02dab167f8636744c4d07dfc90b6c9fa8aec
+EBUILD wine-staging-9999.ebuild 13745 BLAKE2B ab12fda76bb7c6fb1caaea88d06e42899303766f7c2c6221c653123fe22385840d2f00dac0bb46c129fb9310fba0497ee27628bc248be87aeb542eb5c473e690 SHA512 cd4ea13ce79f8a95ef0ce1e585270958874d7fbdc5740cbd1ea680daa7d31c44002f085f22ac08bd00345e029e3c02dab167f8636744c4d07dfc90b6c9fa8aec
 MISC metadata.xml 2538 BLAKE2B cb657e04ad7f26b088f03f862a7e7ccbc4eb6592de17ec8022b5e4b306bd10f7daae7f6de113b142a9cf713a91cab9fbd0650cca4591adc13e4a77280f9812e3 SHA512 a87687fb1a0d2f639626f4a90e7fb78bd31926c53460af3cc80c93e9974f189b545c830278157893f5e48a54b20e5b49b2d1e996ccb5520a47f319b7048999a7
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index d5832e55b076..9b2fa68aa6e5 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -201,6 +201,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-staging/wine-staging-8.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 4c8102d89813..f2f9ddf5ead8 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -214,6 +214,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-staging/wine-staging-8.12.ebuild b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 4c8102d89813..f2f9ddf5ead8 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -214,6 +214,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-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index ce3852c77cc9..bf30ea0d2af9 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
@@ -137,8 +138,11 @@ BDEPEND="
 			sys-apps/util-linux
 		)
 	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
 	dev-lang/perl
-	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -222,6 +226,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
 
@@ -284,18 +300,18 @@ src_configure() {
 		$(use_with xinerama)
 	)
 
-	# 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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index ce3852c77cc9..bf30ea0d2af9 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
@@ -137,8 +138,11 @@ BDEPEND="
 			sys-apps/util-linux
 		)
 	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
 	dev-lang/perl
-	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -222,6 +226,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
 
@@ -284,18 +300,18 @@ src_configure() {
 		$(use_with xinerama)
 	)
 
-	# 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}