[gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/

["Vadim Misbakh-Soloviov" <mva@gentoo.org>]

commit:     0b528a6fa810acfc36650d42ec5f84bf326bddea
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 01:35:13 2024 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 01:35:13 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=0b528a6f

games-strategy/vcmi: fix build && added 9999

Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 games-strategy/vcmi/vcmi-1.5.7.ebuild              | 32 ++++++++++++++++++++--
 .../vcmi/{vcmi-1.5.7.ebuild => vcmi-9999.ebuild}   | 32 ++++++++++++++++++++--
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/games-strategy/vcmi/vcmi-1.5.7.ebuild b/games-strategy/vcmi/vcmi-1.5.7.ebuild
index 21dc51e..b8b54f3 100644
--- a/games-strategy/vcmi/vcmi-1.5.7.ebuild
+++ b/games-strategy/vcmi/vcmi-1.5.7.ebuild
@@ -10,11 +10,27 @@ inherit cmake lua-single
 
 DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
 HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcmi/vcmi"
+	EGIT_SUBMODULES=(
+		"-*"
+		"innoextract"
+	)
+else
+	INNO_SHA="9977089412ebafe9f79936aa65a2edf16a84ae3e"
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vcmi/innoextract/archive/${INNO_SHA}.tar.gz -> ${PN}-innoextract-${INNO_SHA}.tar.gz
+	"
+	# N.B.: see here for correct commit of innoextract:
+	#https://github.com/vcmi/vcmi/tree/develop/launcher
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 # TODO: other arches
 IUSE="+editor debug erm +launcher lua +nullkiller-ai +translations"
 
@@ -47,7 +63,8 @@ CDEPEND="
 	nullkiller-ai? ( dev-cpp/tbb )
 	sys-libs/zlib:=[minizip]
 "
-
+	# app-arch/innoextract
+	# XXX: 👆 vcmi wants it's own patched version to build extractor as library (bruh...)
 BDEPEND="
 	>dev-libs/boost-1.70.0
 	virtual/pkgconfig
@@ -63,6 +80,15 @@ RDEPEND="
 # 	games-strategy/vcmi-data
 # "
 
+src_unpack() {
+	[[ "${PV}" == *9999* ]] && git-r3_src_unpack
+	default
+	[[ "${PV}" == *9999* ]] || {
+		rmdir "${S}/launcher/lib/innoextract"
+		mv "${WORKDIR}/innoextract-${INNO_SHA}" "${S}/launcher/lib/innoextract"
+	}
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ERM=$(usex erm)

diff --git a/games-strategy/vcmi/vcmi-1.5.7.ebuild b/games-strategy/vcmi/vcmi-9999.ebuild
similarity index 73%
copy from games-strategy/vcmi/vcmi-1.5.7.ebuild
copy to games-strategy/vcmi/vcmi-9999.ebuild
index 21dc51e..b8b54f3 100644
--- a/games-strategy/vcmi/vcmi-1.5.7.ebuild
+++ b/games-strategy/vcmi/vcmi-9999.ebuild
@@ -10,11 +10,27 @@ inherit cmake lua-single
 
 DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
 HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcmi/vcmi"
+	EGIT_SUBMODULES=(
+		"-*"
+		"innoextract"
+	)
+else
+	INNO_SHA="9977089412ebafe9f79936aa65a2edf16a84ae3e"
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vcmi/innoextract/archive/${INNO_SHA}.tar.gz -> ${PN}-innoextract-${INNO_SHA}.tar.gz
+	"
+	# N.B.: see here for correct commit of innoextract:
+	#https://github.com/vcmi/vcmi/tree/develop/launcher
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 # TODO: other arches
 IUSE="+editor debug erm +launcher lua +nullkiller-ai +translations"
 
@@ -47,7 +63,8 @@ CDEPEND="
 	nullkiller-ai? ( dev-cpp/tbb )
 	sys-libs/zlib:=[minizip]
 "
-
+	# app-arch/innoextract
+	# XXX: 👆 vcmi wants it's own patched version to build extractor as library (bruh...)
 BDEPEND="
 	>dev-libs/boost-1.70.0
 	virtual/pkgconfig
@@ -63,6 +80,15 @@ RDEPEND="
 # 	games-strategy/vcmi-data
 # "
 
+src_unpack() {
+	[[ "${PV}" == *9999* ]] && git-r3_src_unpack
+	default
+	[[ "${PV}" == *9999* ]] || {
+		rmdir "${S}/launcher/lib/innoextract"
+		mv "${WORKDIR}/innoextract-${INNO_SHA}" "${S}/launcher/lib/innoextract"
+	}
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ERM=$(usex erm)