gentoo resync : 05.02.2020

5 files changed, 66 insertions, 12 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 0b6bc25be9e9..41c69355399f 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,9 +1,10 @@
 AUX mgba-0.6.3-qt511.patch 975 BLAKE2B 3fdafdd9a10cd643fbf29a76baf4e49db50142a2f1b096f8c8b962e38166756016bf663b53dd6cf3a2e33f2f28313d477463d8807d4ecb3139bf7a0943ae0274 SHA512 41e0ea8568d8ffddac2b9020933fd4a21562049b82bfd95bb0ae372702b3312c7ee3f03e03a36fcaec723d999f7820a785a730354825cee1a737d6c2accbfb29
+AUX mgba-0.8.0-no_sdl.patch 1465 BLAKE2B 07ca5575da44b787ee1a25c41558f7e198bb89b999036d80c5ac5501922dd7ed8d9232686c23c7d8e00abc69a18c70c3f8094b81d30de9fda081663b83f706bc SHA512 848e3b47d7c4a9dcbbe292fb59a351dcb00a60af2999e9d8be66a0a294f7f32e745fedbbad625e83707efcffeeae23ea4bd915c3f598c88185b9a0cb54fc95ac
 DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8_beta1.tar.gz 11709751 BLAKE2B 5e09bc3de69b5c41a2cfe39fc302f3fc9d9f2d381b0ca72b24b8d3c82d21a7d900d7b6a78a1ea17a456d4cfe3be6bcfce3a46efcfbb43ee4e0e581eca68f9c71 SHA512 1a69b9826f72260fc56c3615951fda33b617898b9e459142f9d6ac3c1c07a2d668eb91e6776047665f999a013619887b55e0491a95b6708f71ab63bfbe02728a
+DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2
 EBUILD mgba-0.6.3.ebuild 2465 BLAKE2B 257defb779b5ce3a166ea07bbcfe4b44c53093009dc135af27d2d6a80e88ff7c51edc6e4442be491ba52c9606fd6abd53037d2693b0fcf86dce808e32c830b4b SHA512 5c610cc8db0c57f8ee670c547879134ee8c4dce86c4c6c325e5af5aba2f5176b41ec470b0dc94eb568d9b0cb8d6a961e0e032172ad22d1832a5e0ac85e94953a
 EBUILD mgba-0.7.3.ebuild 2481 BLAKE2B 21a9cc746f22c2c35418ae63273d9d21fa3a92d07da5f3819c31f509e99f80e9e22fd4cc4d1225dbbf230d366697d7d001e88ad5043782a5e8bb7324c0ea3d8a SHA512 e62defdf4ce18db18bc9a9d94de4e4d7e48ebd9d3300d626111672f55cfe8ed7f1eacab84f86fa0e23b66a8afd855ee0dd5ad05610ba0e4191693a1ec31e6687
-EBUILD mgba-0.8_beta1.ebuild 2570 BLAKE2B 8eb90ae8dc21d1a4940b998cd90a9acf31a9ce515f9393090a4fd6280ac4dea63264917a92ec30b90055b43e17e45a77563da23fb069effb88d0833e173dc83b SHA512 986cf871b7e089dbec89106de3e2144cfb585ecde8525d69b29d7c46160809ba0c14eafeb86fdf2472160fde1b5c2bd13dac8e044502226419711d2ee1e0a764
-EBUILD mgba-9999.ebuild 2570 BLAKE2B 8eb90ae8dc21d1a4940b998cd90a9acf31a9ce515f9393090a4fd6280ac4dea63264917a92ec30b90055b43e17e45a77563da23fb069effb88d0833e173dc83b SHA512 986cf871b7e089dbec89106de3e2144cfb585ecde8525d69b29d7c46160809ba0c14eafeb86fdf2472160fde1b5c2bd13dac8e044502226419711d2ee1e0a764
-MISC metadata.xml 445 BLAKE2B f8083e3c7dbf76e1f8e848e5d46c81acd0178c9ee5fd20ad01b6a0f82c203b19ff0682b3808dbaa943d38bef8b3f7c73a959d0976cdaf9b5135d1cece9f9a04e SHA512 18666c378ed81e5b4b8d0c7764fe3bcd25be4251449dc7890eb99194e17591755dc67eb12f1260a375008a75508b57ee57b187c668a8d595a20829ac315e633a
+EBUILD mgba-0.8.0.ebuild 2579 BLAKE2B e1cbd44cc6400193eee9b41866ac582258d5be07d7c64b9e4b03845023ea6170a759d66b564de8dd3738a3c1493563c5cd0c18c0f1414c17a7cf872557562cba SHA512 d09c0620feb178d48a485ab15701e16b3f72a42b757402a75b7251965f317c912dc07cfe9ed9aa8e8a89d1fe7a81a04d1e47d6827671a9b1b80e4c1fe23e2197
+EBUILD mgba-9999.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65
+MISC metadata.xml 504 BLAKE2B c297828f1153ba0fa214bd849c22af964f8d5c0134f361956c80ea6239424aeb5eeb83f98a65dc7c924f9f7238223064fa25b3ee048e0e456fb9cdc432500b17 SHA512 2f481e401b55e4aa7089851c9869ec9aee349321a0f720b038e673f3f815c59be9c4cd0db667330ca1273bc7ebaf9671733e2b53e9f2fc34bc655709fbebca15
diff --git a/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch b/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
new file mode 100644
index 000000000000..d89828976cd2
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
@@ -0,0 +1,50 @@
+From aa3403401bfb7259795313603929586bee91ce1b Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+Date: Fri, 31 Jan 2020 18:09:58 -0800
+Subject: [PATCH] Qt: Fix non-SDL build (fixes #1656)
+
+---
+ CHANGES                             |  3 +++
+ src/platform/qt/InputController.cpp | 12 ++++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/CHANGES b/CHANGES
+index 7aac48d6..6418b059 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -1,3 +1,6 @@
++Misc:
++ - Qt: Fix non-SDL build (fixes mgba.io/i/1656)
++
+ 0.8.0: (2020-01-21)
+ Features:
+  - Improved logging configuration
+diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
+index 77ee0704..c6a598ce 100644
+--- a/src/platform/qt/InputController.cpp
++++ b/src/platform/qt/InputController.cpp
+@@ -271,9 +271,21 @@ void InputController::setPreferredGamepad(uint32_t type, int index) {
+ 	if (!m_config) {
+ 		return;
+ 	}
++#ifdef BUILD_SDL
+ 	char name[34] = {0};
++#if SDL_VERSION_ATLEAST(2, 0, 0)
+ 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick), name, sizeof(name));
++#else
++	const char* name = SDL_JoystickName(SDL_JoystickIndex(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick));
++	if (!name) {
++		return;
++	}
++#endif
+ 	mInputSetPreferredDevice(m_config->input(), "gba", type, m_playerId, name);
++#else
++	UNUSED(type);
++	UNUSED(index);
++#endif
+ }
+ 
+ mRumble* InputController::rumble() {
+-- 
+2.25.0
+
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
index ef2909f744e8..d65ffa04f67d 100644
--- a/games-emulation/mgba/metadata.xml
+++ b/games-emulation/mgba/metadata.xml
@@ -6,6 +6,7 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
+    <flag name="discord">Enable Discord RPC support</flag>
     <flag name="elf">Enable the use of elf utils via <pkg>dev-libs/elfutils</pkg></flag>
   </use>
   <upstream>
diff --git a/games-emulation/mgba/mgba-0.8_beta1.ebuild b/games-emulation/mgba/mgba-0.8.0.ebuild
index 035f986d3021..15a46f8a7006 100644
--- a/games-emulation/mgba/mgba-0.8_beta1.ebuild
+++ b/games-emulation/mgba/mgba-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -31,7 +31,6 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	imagemagick? ( media-gfx/imagemagick:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5
@@ -45,6 +44,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-no_sdl.patch" #707578
+)
+
 src_prepare() {
 	xdg_environment_reset
 	cmake_src_prepare
@@ -69,6 +72,7 @@ src_configure() {
 		-DM_CORE_GB=ON
 		-DM_CORE_GBA=ON
 		-DUSE_DEBUGGERS="$(usex debug)"
+		-DUSE_DISCORD_RPC="$(usex discord)"
 		-DUSE_EDITLINE="$(usex debug)"
 		-DUSE_ELF="$(usex elf)"
 		-DUSE_EPOXY=OFF
@@ -76,7 +80,6 @@ src_configure() {
 		-DUSE_GDB_STUB="$(usex debug)"
 		-DUSE_LIBZIP=OFF
 		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
 		-DUSE_MINIZIP=ON
 		-DUSE_PNG=ON
 		-DUSE_SQLITE3="$(usex sqlite)"
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index 035f986d3021..1200fa57ed49 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -31,7 +31,6 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	imagemagick? ( media-gfx/imagemagick:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5
@@ -69,6 +68,7 @@ src_configure() {
 		-DM_CORE_GB=ON
 		-DM_CORE_GBA=ON
 		-DUSE_DEBUGGERS="$(usex debug)"
+		-DUSE_DISCORD_RPC="$(usex discord)"
 		-DUSE_EDITLINE="$(usex debug)"
 		-DUSE_ELF="$(usex elf)"
 		-DUSE_EPOXY=OFF
@@ -76,7 +76,6 @@ src_configure() {
 		-DUSE_GDB_STUB="$(usex debug)"
 		-DUSE_LIBZIP=OFF
 		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
 		-DUSE_MINIZIP=ON
 		-DUSE_PNG=ON
 		-DUSE_SQLITE3="$(usex sqlite)"