[gentoo-commits] repo/proj/guru:master commit in: games-emulation/yuzu/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     ed2626d52f3bc7cb417b446b420d2130e7df2bf3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Aug  4 10:04:03 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Aug  4 10:04:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed2626d5

games-emulation/yuzu: new flag for test, disable test in snapshot

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 2 +-
 games-emulation/yuzu/yuzu-9999.ebuild        | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
index 5e5df4fd6..8bc53d5fc 100644
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/vulkan-headers-1.3.216
 "
 BDEPEND="
-	>=dev-cpp/catch-2.13:0
 	>=dev-cpp/nlohmann_json-3.8.0
 	dev-cpp/robin-map
 	dev-util/glslang
@@ -104,6 +103,7 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
+		-DYUZU_TESTS=OFF
 		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 5ec1e0537..953cae7e0 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT
 	!system-vulkan? ( Apache-2.0 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"
+IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine +webservice"
 
 RDEPEND="
 	<net-libs/mbedtls-3.1[cmac]
@@ -48,13 +48,14 @@ DEPEND="${RDEPEND}
 	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
-	>=dev-cpp/catch-2.13:0
+	test? ( <dev-cpp/catch-3:0 )
 	>=dev-cpp/nlohmann_json-3.8.0
 	dev-cpp/robin-map
 	dev-util/glslang
 	discord? ( >=dev-libs/rapidjson-1.1.0 )
 "
 REQUIRED_USE="|| ( qt5 sdl )"
+RESTRICT="!test? ( test )"
 
 pkg_setup() {
 	if tc-is-gcc; then
@@ -131,7 +132,7 @@ src_prepare() {
 	sed -i '/sirit/d' externals/CMakeLists.txt || die
 
 	# Unbundle cpp-httplib
-	sed -i -e '/^	# cpp-httplib/,/^	endif()/d' externals/CMakeLists.txt || die
+	sed -i -e '/^	# httplib/,/^	endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle enet
 	sed -i -e '/enet/d' externals/CMakeLists.txt || die
@@ -152,6 +153,7 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
+		-DYUZU_TESTS=$(usex test)
 		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)