gentoo auto-resync : 08:01:2024 - 18:59:30

3 files changed, 63 insertions, 35 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index cd8c737362f0..a878ce400bf9 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,6 +1,7 @@
 AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b685b4b52602fe6447dd1b29513b526e101a306558b9a912bbb3c1438ea6a70df1c9e6368e2ca2ba5b50e6a59200b2a11daf SHA512 3227908dca7a2973ae5c7ec311b683362adf16ae5d5c801943322962d181ad046f43383bdf86441d81284f4f567a8d8ae387f4c15bf25b3d4189882fecd79d6b
 DIST mgba-0.10.2.tar.gz 14323388 BLAKE2B fb2e652b76871c9a9ffdbf049965ca4a62ee8fed48b547a4e7d514587535f172a7e3b21ec138b8660707a2fbdc19268985191d10eb268e7ed0f059c5a8c81216 SHA512 4063cde6dee9cc07025fa997e401ddd4b28240a9e53cee571ef8aec65cb6cf56b821f0020af1cf00d4f97353efbd4dc39ccd55bc6a3bdf0448ee34736bfd6499
+DIST mgba-0.10.3.tar.gz 14350721 BLAKE2B 2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656 SHA512 de92725a18f00ec8645a75cf434a667bfc5aba954d0ae8be188241371a4a310214123be2cec13d20dbff4f660b401364efb51c43c7bdc24eea40454949062a52
 EBUILD mgba-0.10.2-r1.ebuild 2681 BLAKE2B a5274754fdecd3207c53e92de2e67856b2b2ca3d947525e078b6f906080a9a7ef58b73a5b014bb889ca18894ac6f846c877f6ce716a771a0cbbe9f538930769e SHA512 ed24c9b812a39bb9455ecd89340d04ef2ec15cfe21a62c868d13e32f6eebbaa774894fbcf275fa3d8936d6f80801e53d1e14c18d6ffdc29a8c3ace4b7d76a8c2
-EBUILD mgba-0.10.2.ebuild 2652 BLAKE2B a0a461c8e35bd12f60908f7e4d92306f3a9a43733f4958e3b4528034ac1c700d3222755424c78ec33050700bc0a2fbddcfe15824425a69f88cb1f8d13689b7dd SHA512 5d0859ed7e562a6e0216260aa4dab99ddd86c7b677fc0c79ed2c50e984e3823b763be0fbfff3cad2ae96fbdbd0385c0968c55ca927acdb46dce2a76d506ce435
-EBUILD mgba-9999.ebuild 2684 BLAKE2B d74b9d31d7b186c189dea907e7c8e46e3c0d87e929a6c8d2e0568476a4fdfcf9b89a579234bfb57de1939c09c42178ad65d6d96b1999ae02ec907de7fa793125 SHA512 c22de781bd85f0dca03ffb2c0bcdc64d46eb0a0fe4b2b74b36d39fd71e6a6832e15ae030a37719d1c63c167279595a4ab6d56eeb0ea0d267d17a974facf673f5
+EBUILD mgba-0.10.3.ebuild 2694 BLAKE2B f4b9c464ee57e52b8822a98b9c94c84a96f929380e4aaa82411f9438d1617453021c2b0ec88d7c21ec7711a0517377821e60d676b9c09c76f4b5371f22f72b75 SHA512 961a6f0d1b391c67fd894327926a84794182d98e2d12bc6606d0338d87705983ca1dd1c5275d161b1c172ceb49c4c998309a60e166566adaaab3cb4715dcb082
+EBUILD mgba-9999.ebuild 3064 BLAKE2B ce8bc60d0faf921d83c33548a8c7979cf32a68e12c7686631b447428f787072c926a5da7a48dacacc3bb804dc81dd9c58efb3a6aa97c7b4c6ffe20b37ef6b9f7 SHA512 9c0cb0bece9efec9f0df2ffbe8bc99f61f16321a54edb84f803084d2d8f4ee20d0e14ee43c2a1bf5909a7632a0051fe1c4df280e729b14e294481fef48996b5e
 MISC metadata.xml 623 BLAKE2B 888308191968b294352854c1228bcf82b25a3836fa53e1bf961e264c9a4f91c6e10f5598d4ba9a13927413f10a0686dfe180cd21e26e04c4c7c694f140dce9ff SHA512 93078c5ce55d268ebbed1789d80c8c5d9ef291fd1f48f2e4e1d124d3f4fb446bc7ec28fb6f20f4e79eecff64f2ff601408ef97555a5a9b55052312fb69c0e1fb
diff --git a/games-emulation/mgba/mgba-0.10.2.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
index 1faa65354ce9..ccd1355085e6 100644
--- a/games-emulation/mgba/mgba-0.10.2.ebuild
+++ b/games-emulation/mgba/mgba-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Game Boy Advance Emulator"
@@ -19,10 +19,14 @@ 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"
+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} )"
+	lua? ( ${LUA_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -43,13 +47,16 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )"
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
 	gui? ( dev-qt/linguist-tools:5 )
-	lua? ( virtual/pkgconfig )"
+	lua? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
@@ -67,24 +74,25 @@ src_configure() {
 		-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=OFF
+		-DBUILD_UPDATER=no
 		-DENABLE_SCRIPTING=$(usex lua)
-		-DMARKDOWN=OFF #752048
+		-DMARKDOWN=no #752048
 		-DUSE_DEBUGGERS=$(usex debug)
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_EDITLINE=$(usex debug)
 		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
+		-DUSE_EPOXY=no
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
+		-DUSE_LIBZIP=no
+		-DUSE_LZMA=yes
+		-DUSE_MINIZIP=yes
+		-DUSE_PNG=yes
 		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
+		-DUSE_ZLIB=yes
 		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
 	)
 	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
@@ -93,7 +101,7 @@ src_configure() {
 }
 
 src_test() {
-	# CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
 	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
 
 	cmake_src_test
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index 3bfc5e6ae130..d4ce0e18832b 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,10 +19,14 @@ 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"
+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} )"
+	lua? ( ${LUA_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -33,7 +37,10 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:= )
 	gles2? ( media-libs/libglvnd )
 	gles3? ( media-libs/libglvnd )
-	lua? ( ${LUA_DEPS} )
+	lua? (
+		${LUA_DEPS}
+		dev-libs/json-c:=
+	)
 	opengl? ( media-libs/libglvnd )
 	gui? (
 		dev-qt/qtcore:5
@@ -43,13 +50,16 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )"
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
 	gui? ( dev-qt/linguist-tools:5 )
-	lua? ( virtual/pkgconfig )"
+	lua? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
@@ -67,25 +77,25 @@ src_configure() {
 		-DBUILD_GLES3=$(usex gles3)
 		-DBUILD_LIBRETRO=$(usex libretro)
 		-DBUILD_QT=$(usex gui)
-		-DBUILD_ROM_TEST=ON #918855
+		-DBUILD_ROM_TEST=yes #918855
 		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
 		-DBUILD_SUITE=$(usex test)
-		-DBUILD_UPDATER=OFF
+		-DBUILD_UPDATER=no
 		-DENABLE_SCRIPTING=$(usex lua)
-		-DMARKDOWN=OFF #752048
+		-DMARKDOWN=no #752048
 		-DUSE_DEBUGGERS=$(usex debug)
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_EDITLINE=$(usex debug)
 		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
+		-DUSE_EPOXY=no
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
+		-DUSE_LIBZIP=no
+		-DUSE_LZMA=yes
+		-DUSE_MINIZIP=yes
+		-DUSE_PNG=yes
 		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
+		-DUSE_ZLIB=yes
 		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
 	)
 	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
@@ -94,7 +104,7 @@ src_configure() {
 }
 
 src_test() {
-	# CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
 	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
 
 	cmake_src_test
@@ -107,3 +117,12 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
 }
+
+pkg_preinst() {
+	# hack: .shader/ were directories in <0.11 and are now single (zip) files
+	# named the same, that leads to portage mis-merging and leaving an empty
+	# directory behind rather than the new file
+	if use gui && has_version '<games-emulation/mgba-0.11[gui]'; then
+		rm -rf -- "${EROOT}"/usr/share/mgba/shaders/*.shader/ || die
+	fi
+}