gentoo auto-resync : 14:12:2024 - 02:02:07

3 files changed, 124 insertions, 15 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index b8bd43eabb41..3a0dcb324c4a 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,6 +1,8 @@
 AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b685b4b52602fe6447dd1b29513b526e101a306558b9a912bbb3c1438ea6a70df1c9e6368e2ca2ba5b50e6a59200b2a11daf SHA512 3227908dca7a2973ae5c7ec311b683362adf16ae5d5c801943322962d181ad046f43383bdf86441d81284f4f567a8d8ae387f4c15bf25b3d4189882fecd79d6b
 AUX mgba-0.10.3-rapidjson-gcc14-const.patch 821 BLAKE2B 81ee40e4782c3328114b63f864db8c3ceca3998bb3e6a29f9387ea5d5c2820677f98a98638a36476d0e222bec5a4bc08b9d41278d6368c37bf62abac1f7c49f8 SHA512 777a0980c69d60ca6c0d4aaef8ab4de82d6e191c518490040b43551b6f56779b84a7aa90f388f251ee4e493dd97d6e3c16c7f3fb0c09cbf79505cff09e8ecd5f
 DIST mgba-0.10.3.tar.gz 14350721 BLAKE2B 2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656 SHA512 de92725a18f00ec8645a75cf434a667bfc5aba954d0ae8be188241371a4a310214123be2cec13d20dbff4f660b401364efb51c43c7bdc24eea40454949062a52
+DIST mgba-0.10.4.tar.gz 14355132 BLAKE2B 1f99fd1f79e1645f2de8c1fbd07bdc4996fbc12263fd14b3588e0dcccff910780be73ed92084e53ed873f5e55eef70a983afee2f3f0bd166c578a03bcf57ea0b SHA512 300c09ae8d6dc9677aabb6771345da42b78dc2e4e63e14f1fc404b89737e5161f412f4903488fd222fcf3ac9b0161ba5947a099cd9b5095137d100ce14a14aa3
 EBUILD mgba-0.10.3.ebuild 2746 BLAKE2B c48a1eb1f8841286c2167936fe3f33b50fb7987072fe03349999918c042465a2dd8d27559fd8465311addc57c2c6db621719540d673b5a668b6eb79a7dd28e4a SHA512 31b2be5c450f713f02926396ee371849b5a6b4659b1782194f80d515dc2d6f8932894ffa433ae01118d49862a3b32fd88bd6423813e43bad2fd999783fec19f7
-EBUILD mgba-9999.ebuild 3248 BLAKE2B eede850d6ccee8293291cf17382a7fe422723b51d5a0cd3f55b3a1ff60e337d35d335fa6862d0d4f8aeb5e1bef59f0de564e7b6ddf0307255986c0d6624ebb77 SHA512 5d01d1a104044f6ae79fa74d25004a98150cc2fb9f0c4462fc80f0332452fc27d5d762718efb37b1dadd0f1124fae6795ee927debc44ac5202e2bddb572448ec
+EBUILD mgba-0.10.4.ebuild 2697 BLAKE2B c52e771d78fb13610e622bb42692bcc397562e5b3b276a11bc2e3daa3ba0ed42fe6e5d5eed5aa0e3e5b8cdb9acc0ecd1dc6850ef286db102c9b5e7195f3824f1 SHA512 5ecabeab11893c18d31311ecfe6c3ec88037b83da518d0588e304e66097d5aa1d9cbd0d4c19985cab012ffc60faa2f071650e04f34b387da93d6d1c69a8be3e4
+EBUILD mgba-9999.ebuild 3098 BLAKE2B 1a152cb2d81ca61e1091db1af04230198902285883fa93602b97f5526acec408035d48d8be587ae7ab189cc85f97bb466797d30ed6561cb52505400233208164 SHA512 96c6aad92e34e247aa11747f583e52965f3e71b85daea6a0ba75bbe178e1bb5976d9e2b0f602dfe39df2879f95a512f07a0d073de9b095b8493c2fd8a0b497c3
 MISC metadata.xml 623 BLAKE2B 888308191968b294352854c1228bcf82b25a3836fa53e1bf961e264c9a4f91c6e10f5598d4ba9a13927413f10a0686dfe180cd21e26e04c4c7c694f140dce9ff SHA512 93078c5ce55d268ebbed1789d80c8c5d9ef291fd1f48f2e4e1d124d3f4fb446bc7ec28fb6f20f4e79eecff64f2ff601408ef97555a5a9b55052312fb69c0e1fb
diff --git a/games-emulation/mgba/mgba-0.10.4.ebuild b/games-emulation/mgba/mgba-0.10.4.ebuild
new file mode 100644
index 000000000000..f0e400060c46
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.10.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3..4} )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
+else
+	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Game Boy Advance Emulator"
+HOMEPAGE="https://mgba.io/"
+
+LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="
+	debug discord elf ffmpeg gles2 gles3 gui libretro
+	lua +opengl +sdl +sqlite test
+"
+REQUIRED_USE="
+	gui? ( || ( gles2 gles3 opengl ) sqlite )
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libpng:=
+	sys-libs/zlib:=[minizip]
+	debug? ( dev-libs/libedit )
+	elf? ( dev-libs/elfutils )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+	lua? ( ${LUA_DEPS} )
+	opengl? ( media-libs/libglvnd )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	gui? ( dev-qt/linguist-tools:5 )
+	lua? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CINEMA=$(usex test)
+		-DBUILD_GL=$(usex opengl)
+		-DBUILD_GLES2=$(usex gles2)
+		-DBUILD_GLES3=$(usex gles3)
+		-DBUILD_LIBRETRO=$(usex libretro)
+		-DBUILD_QT=$(usex gui)
+		-DBUILD_ROM_TEST=yes #918855
+		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
+		-DBUILD_SUITE=$(usex test)
+		-DBUILD_UPDATER=no
+		-DENABLE_SCRIPTING=$(usex lua)
+		-DMARKDOWN=no #752048
+		-DUSE_DEBUGGERS=$(usex debug)
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_EDITLINE=$(usex debug)
+		-DUSE_ELF=$(usex elf)
+		-DUSE_EPOXY=no
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GDB_STUB=$(usex debug)
+		-DUSE_LIBZIP=no
+		-DUSE_LZMA=yes
+		-DUSE_MINIZIP=yes
+		-DUSE_PNG=yes
+		-DUSE_SQLITE3=$(usex sqlite)
+		-DUSE_ZLIB=yes
+		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
+	)
+	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
+	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
+
+	rm -r -- "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
+}
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index afc5b4396e02..a599c0cec301 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="
 	debug discord elf ffmpeg gles2 gles3 gui libretro
-	lua +opengl qt6 +sdl +sqlite test
+	lua +opengl +sdl +sqlite test
 "
 REQUIRED_USE="
 	gui? ( || ( gles2 gles3 opengl ) sqlite )
@@ -43,17 +43,8 @@ RDEPEND="
 	)
 	opengl? ( media-libs/libglvnd )
 	gui? (
-		qt6? (
-			dev-qt/qtbase:6[gui,network,opengl,widgets]
-			dev-qt/qtmultimedia:6
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtmultimedia:5
-			dev-qt/qtnetwork:5
-			dev-qt/qtwidgets:5
-		)
+		dev-qt/qtbase:6[gui,network,opengl,widgets]
+		dev-qt/qtmultimedia:6
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
 	sqlite? ( dev-db/sqlite:3 )
@@ -63,7 +54,7 @@ DEPEND="
 	test? ( dev-util/cmocka )
 "
 BDEPEND="
-	gui? ( dev-qt/linguist-tools:5 )
+	gui? ( dev-qt/qttools:6[linguist] )
 	lua? ( virtual/pkgconfig )
 "
 
@@ -83,7 +74,7 @@ src_configure() {
 		-DBUILD_GLES3=$(usex gles3)
 		-DBUILD_LIBRETRO=$(usex libretro)
 		-DBUILD_QT=$(usex gui)
-		$(usev gui -DFORCE_QT_VERSION=$(usex qt6 6 5))
+		$(usev gui -DFORCE_QT_VERSION=6)
 		-DBUILD_ROM_TEST=yes #918855
 		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
 		-DBUILD_SUITE=$(usex test)