From f2a6280c2b576e13b82d9db829ee0c771ccbbdd8 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 18 Mar 2026 19:59:13 +0100
Subject: [PATCH] games-engines/solarus: Consolidate live switches, add missing
 DEPEND

Bug: https://bugs.gentoo.org/953383
Closes: https://bugs.gentoo.org/879529
Closes: https://bugs.gentoo.org/923398
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 games-engines/solarus/solarus-2.0.3-r1.ebuild | 15 +++++----------
 games-engines/solarus/solarus-9999.ebuild     | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/games-engines/solarus/solarus-2.0.3-r1.ebuild b/games-engines/solarus/solarus-2.0.3-r1.ebuild
index 4fa05e474c416..aa7cdf2f97d27 100644
--- a/games-engines/solarus/solarus-2.0.3-r1.ebuild
+++ b/games-engines/solarus/solarus-2.0.3-r1.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 luajit )
 
 inherit cmake lua-single optfeature virtualx
 
-DESCRIPTION="An open-source Zelda-like 2D game engine"
+DESCRIPTION="Open-source Zelda-like 2D game engine"
 HOMEPAGE="https://www.solarus-games.org/"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,6 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.bz2"
+	S="${WORKDIR}/solarus-v${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -36,19 +37,13 @@ RDEPEND="
 	media-libs/sdl2-image[png]
 	>=media-libs/sdl2-ttf-2.0.12
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
+	media-libs/glm
 "
-
 BDEPEND="
 	doc? ( app-text/doxygen )
 "
 
-if ! [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/solarus-v${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=( -DSOLARUS_USE_LUAJIT="$(usex lua_single_target_luajit)" )
 	cmake_src_configure
@@ -73,5 +68,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	 optfeature "the Solarus Quest Editor" games-misc/solarus-quest-editor
+	optfeature "the Solarus Quest Editor" games-misc/solarus-quest-editor
 }
diff --git a/games-engines/solarus/solarus-9999.ebuild b/games-engines/solarus/solarus-9999.ebuild
index 4fa05e474c416..aa7cdf2f97d27 100644
--- a/games-engines/solarus/solarus-9999.ebuild
+++ b/games-engines/solarus/solarus-9999.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 luajit )
 
 inherit cmake lua-single optfeature virtualx
 
-DESCRIPTION="An open-source Zelda-like 2D game engine"
+DESCRIPTION="Open-source Zelda-like 2D game engine"
 HOMEPAGE="https://www.solarus-games.org/"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,6 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.bz2"
+	S="${WORKDIR}/solarus-v${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -36,19 +37,13 @@ RDEPEND="
 	media-libs/sdl2-image[png]
 	>=media-libs/sdl2-ttf-2.0.12
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
+	media-libs/glm
 "
-
 BDEPEND="
 	doc? ( app-text/doxygen )
 "
 
-if ! [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/solarus-v${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=( -DSOLARUS_USE_LUAJIT="$(usex lua_single_target_luajit)" )
 	cmake_src_configure
@@ -73,5 +68,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	 optfeature "the Solarus Quest Editor" games-misc/solarus-quest-editor
+	optfeature "the Solarus Quest Editor" games-misc/solarus-quest-editor
 }