5 files changed, 163 insertions, 60 deletions
diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest
index b3423b06166c..755b1ed6e416 100644
--- a/games-engines/solarus/Manifest
+++ b/games-engines/solarus/Manifest
@@ -1,3 +1,4 @@
-DIST solarus-1.3.1-src.tar.gz 2450599 BLAKE2B e8aefa36d48753b1362283c8818b6efdc82c2d6ed7612c15d5e45b035a131ec6fd5792f85e4b956afa3e1d51e0dc311d7d6fabb5750b7b8781c69169b61fe1d9 SHA512 f52a46add1432a98931db8d26496371b5ff843151c8ac0fdaf1e774be37399d9be6c401f263a65aa08b96f3eebda367b4ccb07ef6cb9740b3112b01e4763556b
-EBUILD solarus-1.3.1-r100.ebuild 1092 BLAKE2B 98a582f19d24874d61346b5b4fba4265fe32f1b4eba03412f44a8a8e3a762580d2fd7681a214f950967a09944400fbacfbc5acfa3b52df85b4c5f627e3eebd63 SHA512 51f7b846920143d093609db771d20597b0532310086181d88f8cc7a8bbbc14c5b1feb9b1da2221cb3d078ebeb6be557892a651d231cdb501e87218e041c9276f
-MISC metadata.xml 419 BLAKE2B fbac393c8bf1248ec59a5599e79f233b59ddb8d4739b8094c5a4dab9af38ed120b71ec39e5a7ce6122ca4c611e2b8fba6f4aca20322ceeade4c55ac9dfc598ff SHA512 b0eddb90fa472564debc44cb736d5a34f57e12411d8640aed30f55b12ed902202d6f4ccbb3ad5973b493aa73c1fe58e07ad16ab2bc2ae3f89509e6071ea4a22d
+DIST solarus-v1.6.5.tar.gz 15010899 BLAKE2B 96a67c7210c70d23d3fa08e24ee2c4cfbeb6e95dce7236ab860695bf4fc57aaa5d54b02e25ad2f10dfc498cc836bf83753d99cbeca1ff7bf496f7d589accbbf5 SHA512 3fc7473f1b7dd80cbcb0a7a639701f8b12bd40ee918a7853805bd54f877e752b4c31c26828e62248ca4594b3aed41a8c61a16be3b14b293f08d9ba938a723e91
+EBUILD solarus-1.6.5.ebuild 1534 BLAKE2B 9dd7fa95d877bbd58404356ddcd54d4a5c267dacee19e03823fbdcab591300e816f564ee2d6b56dffc241fd368890cee048ee7f52f683f8ffb5a03b73be9afe2 SHA512 9e390ee0051f2e0cfd60adf98c6205fce778a0f9a3de8e4e4fabf73ac1c0bbb6e5431761092636f8f68d5ddcedec3ccd57e4a7405118df026bdac1397b0e41a9
+EBUILD solarus-9999.ebuild 1534 BLAKE2B 9dd7fa95d877bbd58404356ddcd54d4a5c267dacee19e03823fbdcab591300e816f564ee2d6b56dffc241fd368890cee048ee7f52f683f8ffb5a03b73be9afe2 SHA512 9e390ee0051f2e0cfd60adf98c6205fce778a0f9a3de8e4e4fabf73ac1c0bbb6e5431761092636f8f68d5ddcedec3ccd57e4a7405118df026bdac1397b0e41a9
+MISC metadata.xml 422 BLAKE2B f5ac594d1a1f1e38a78a1b44a3eae7d92bcabb483d8f510858ebafd163d5f86f7f0310a33cc00f696163c1de32e799f543211ca843610e427e17d69ba392de31 SHA512 faa52c556a651f3ab8f0d8320815b5686c14337e90664f25e1ac7f9351ac14258c4b16f93da09af4b3f2ff30c4013ffd50c58df244f9f7552af348f4b379fc32
diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
index 1633aef30a2d..16d609b36b2d 100644
--- a/games-engines/solarus/metadata.xml
+++ b/games-engines/solarus/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="doc">Install doxygen developer documentation.</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">christopho/solarus</remote-id>
+		<remote-id type="gitlab">solarus-games/solarus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-engines/solarus/solarus-1.3.1-r100.ebuild b/games-engines/solarus/solarus-1.3.1-r100.ebuild
deleted file mode 100644
index 7d865fec4101..000000000000
--- a/games-engines/solarus/solarus-1.3.1-r100.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit cmake lua-single
-
-DESCRIPTION="An open-source Zelda-like 2D game engine"
-HOMEPAGE="https://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	dev-games/physfs
-	media-libs/libmodplug
-	>=media-libs/libsdl2-2.0.1[X,joystick,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png]
-	>=media-libs/sdl2-ttf-2.0.12"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DESTINATION="/usr/bin"
-		-DSOLARUS_USE_LUAJIT="$(usex lua_single_target_luajit)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		cd doc || die
-		doxygen || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	doman solarus.6
-	use doc && dodoc -r doc/${PV%.*}/html/*
-}
diff --git a/games-engines/solarus/solarus-1.6.5.ebuild b/games-engines/solarus/solarus-1.6.5.ebuild
new file mode 100644
index 000000000000..dd0d28447c5d
--- /dev/null
+++ b/games-engines/solarus/solarus-1.6.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake lua-single optfeature virtualx
+
+DESCRIPTION="An open-source Zelda-like 2D game engine"
+HOMEPAGE="https://www.solarus-games.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/solarus-games/solarus.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-games/physfs
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/libmodplug
+	>=media-libs/libsdl2-2.0.1[X,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png]
+	>=media-libs/sdl2-ttf-2.0.12
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	doc? ( app-doc/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
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc ; then
+		cd doc && doxygen || die
+	fi
+}
+
+src_test() {
+	# lua/bugs-{1200,1210} are GUI tests that require X
+	# With EAPI 8, one of the last tests hangs with >= j3
+	virtx cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r doc/${PV%.*}/html/*
+}
+
+pkg_postinst() {
+	 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
new file mode 100644
index 000000000000..dd0d28447c5d
--- /dev/null
+++ b/games-engines/solarus/solarus-9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake lua-single optfeature virtualx
+
+DESCRIPTION="An open-source Zelda-like 2D game engine"
+HOMEPAGE="https://www.solarus-games.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/solarus-games/solarus.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-games/physfs
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/libmodplug
+	>=media-libs/libsdl2-2.0.1[X,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png]
+	>=media-libs/sdl2-ttf-2.0.12
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	doc? ( app-doc/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
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc ; then
+		cd doc && doxygen || die
+	fi
+}
+
+src_test() {
+	# lua/bugs-{1200,1210} are GUI tests that require X
+	# With EAPI 8, one of the last tests hangs with >= j3
+	virtx cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r doc/${PV%.*}/html/*
+}
+
+pkg_postinst() {
+	 optfeature "the Solarus Quest Editor" games-misc/solarus-quest-editor
+}