gentoo auto-resync : 26:05:2024 - 00:07:27

2 files changed, 19 insertions, 11 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 96e29fd89401..b8bd43eabb41 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -2,5 +2,5 @@ AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b
 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
 EBUILD mgba-0.10.3.ebuild 2746 BLAKE2B c48a1eb1f8841286c2167936fe3f33b50fb7987072fe03349999918c042465a2dd8d27559fd8465311addc57c2c6db621719540d673b5a668b6eb79a7dd28e4a SHA512 31b2be5c450f713f02926396ee371849b5a6b4659b1782194f80d515dc2d6f8932894ffa433ae01118d49862a3b32fd88bd6423813e43bad2fd999783fec19f7
-EBUILD mgba-9999.ebuild 3120 BLAKE2B a892c42c3cb889bace3c6b7efc9e89cd1f33e6990373675ef9eca6d789d98b21b89c3b8c9a1583566e2da84bd184b6160678f53c5edc2ed5e5d3d9f442a2148b SHA512 038a96bef3ad6b73f55e967c887f1c8f48168e0f259827b699becc1cf1e7eb0134269ecd11824f898db2dcc1f4333bb9b039ed2ceffff35d0e401a6316d9995b
+EBUILD mgba-9999.ebuild 3248 BLAKE2B eede850d6ccee8293291cf17382a7fe422723b51d5a0cd3f55b3a1ff60e337d35d335fa6862d0d4f8aeb5e1bef59f0de564e7b6ddf0307255986c0d6624ebb77 SHA512 5d01d1a104044f6ae79fa74d25004a98150cc2fb9f0c4462fc80f0332452fc27d5d762718efb37b1dadd0f1124fae6795ee927debc44ac5202e2bddb572448ec
 MISC metadata.xml 623 BLAKE2B 888308191968b294352854c1228bcf82b25a3836fa53e1bf961e264c9a4f91c6e10f5598d4ba9a13927413f10a0686dfe180cd21e26e04c4c7c694f140dce9ff SHA512 93078c5ce55d268ebbed1789d80c8c5d9ef291fd1f48f2e4e1d124d3f4fb446bc7ec28fb6f20f4e79eecff64f2ff601408ef97555a5a9b55052312fb69c0e1fb
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index 97441a1c618f..afc5b4396e02 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 +sdl +sqlite test
+	lua +opengl qt6 +sdl +sqlite test
 "
 REQUIRED_USE="
 	gui? ( || ( gles2 gles3 opengl ) sqlite )
@@ -43,11 +43,17 @@ RDEPEND="
 	)
 	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
+		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
+		)
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
 	sqlite? ( dev-db/sqlite:3 )
@@ -63,7 +69,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
-	"${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch
 )
 
 pkg_setup() {
@@ -78,19 +83,20 @@ src_configure() {
 		-DBUILD_GLES3=$(usex gles3)
 		-DBUILD_LIBRETRO=$(usex libretro)
 		-DBUILD_QT=$(usex gui)
+		$(usev gui -DFORCE_QT_VERSION=$(usex qt6 6 5))
 		-DBUILD_ROM_TEST=yes #918855
 		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
 		-DBUILD_SUITE=$(usex test)
 		-DBUILD_UPDATER=no
+		-DENABLE_DEBUGGERS=$(usex debug)
+		-DENABLE_GDB_STUB=$(usex debug)
 		-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
@@ -116,10 +122,12 @@ src_install() {
 
 	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
 
-	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
+	rm -r -- "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
 }
 
 pkg_preinst() {
+	xdg_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