Merge branch 'master' into 'master'

app-emulation/bottles: detect wine version install on the system

See uest src_prepare/src_prepare-overlay!390

app-emulation/bottles/Manifest

@@ -1,2 +1 @@
-DIST bottles-51.7.tar.gz 2218262 BLAKE2B 0ec97ef4827c2dfa8daf8e8a3ec1d34f9d733533c4d62ae7c041f73cef5a898dc45b2254c94366fd67475a1e671819936c1f74a1415f37395b91a2ec91c6943f SHA512 46599269ae2cde9e7cc7aa2fd4fe917e02654d2c04ef96d480df16804230216c0b09a9acd03d547030b70e68c046a5ca09b6da3232dccbf81ed6a0f7f6899932
 DIST bottles-51.9.tar.gz 2218393 BLAKE2B dcc372b9ba0cc999bf5918e8c620671aa47e0f6615fcc7b7b3899bbbc7c91bfdd0b0c91f4475bc58b29f44bed051576006dc63b20b826c5820fd70879ac6b049 SHA512 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4

app-emulation/bottles/bottles-51.9-r1.ebuild

@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="test"
+IUSE="test llvm-libunwind"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -55,9 +55,18 @@ RDEPEND="
 	media-gfx/imagemagick
 	>=sys-libs/glibc-2.32
 	x11-apps/xdpyinfo
-	|| (
+	llvm-libunwind? (
-		app-emulation/wine-vanilla[X,-llvm-libunwind]
+		|| (
-		app-emulation/wine-staging[X,-llvm-libunwind]
+			app-emulation/wine-vanilla[X,llvm-libunwind]
+			app-emulation/wine-staging[X,llvm-libunwind]
+		)
+	)
+	!llvm-libunwind? (
+		|| (
+			app-emulation/wine-vanilla[X,-llvm-libunwind]
+			app-emulation/wine-staging[X,-llvm-libunwind]
+			app-emulation/wine-proton[X(+),-llvm-libunwind]
+		)
 	)
 	$(python_gen_cond_dep '
 		app-arch/patool[${PYTHON_USEDEP}]
@@ -93,12 +102,20 @@ BDEPEND="
 	)
 "
 
+EPYTEST_DESELECT=(
+	# tests that check execution time are flaky in the right circumstances
+	# (like compiling llvm at the same time type circumstance)
+	"bottles/tests/backend/state/test_events.py::test_set_reset"
+	"bottles/tests/backend/state/test_events.py::test_simple_event"
+	"bottles/tests/backend/state/test_events.py::test_wait_after_done_event"
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
 src_configure() {
-	if  [[ "${PV}" == "9999" ]]; then
+	if [[ "${PV}" == "9999" ]]; then
 		local emesonargs=(
 			-Ddevel=true
 		)
@@ -129,4 +146,9 @@ pkg_postinst() {
 	optfeature "vmtouch support" dev-utils/vmtouch
 	#optfeature "MangoHub support" games-util/mangohub
 	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
+	if !use llvm-libunwind; then
+		ewarn "When using llvm-libunwind useflag all wine version besides\n"
+		ewarn "wine-vanilla and wine-staging are broken (including the runner dowloading from bottles itself)\n"
+		ewarn "So when using llvm-libunwind system wide is recommended to stick only to system wine mentioned above\n"
+	fi
 }

app-emulation/bottles/bottles-9999.ebuild

@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="test"
+IUSE="test llvm-libunwind"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -55,9 +55,18 @@ RDEPEND="
 	media-gfx/imagemagick
 	>=sys-libs/glibc-2.32
 	x11-apps/xdpyinfo
-	|| (
+	llvm-libunwind? (
-		app-emulation/wine-vanilla[X,-llvm-libunwind]
+		|| (
-		app-emulation/wine-staging[X,-llvm-libunwind]
+			app-emulation/wine-vanilla[X,llvm-libunwind]
+			app-emulation/wine-staging[X,llvm-libunwind]
+		)
+	)
+	!llvm-libunwind? (
+		|| (
+			app-emulation/wine-vanilla[X,-llvm-libunwind]
+			app-emulation/wine-staging[X,-llvm-libunwind]
+			app-emulation/wine-proton[X(+),-llvm-libunwind]
+		)
 	)
 	$(python_gen_cond_dep '
 		app-arch/patool[${PYTHON_USEDEP}]
@@ -106,7 +115,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	if  [[ "${PV}" == "9999" ]]; then
+	if [[ "${PV}" == "9999" ]]; then
 		local emesonargs=(
 			-Ddevel=true
 		)
@@ -137,4 +146,9 @@ pkg_postinst() {
 	optfeature "vmtouch support" dev-utils/vmtouch
 	#optfeature "MangoHub support" games-util/mangohub
 	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
+	if !use llvm-libunwind; then
+		ewarn "When using llvm-libunwind useflag all wine version besides\n"
+		ewarn "wine-vanilla and wine-staging are broken (including the runner dowloading from bottles itself)\n"
+		ewarn "So when using llvm-libunwind system wide is recommended to stick only to system wine mentioned above\n"
+	fi
 }