gentoo resync : 21.06.2020

3 files changed, 2 insertions, 57 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index a0897d2e55e8..3afe76bc11ab 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,9 +1,8 @@
-AUX mgba-0.8.0-no_sdl.patch 1465 BLAKE2B 07ca5575da44b787ee1a25c41558f7e198bb89b999036d80c5ac5501922dd7ed8d9232686c23c7d8e00abc69a18c70c3f8094b81d30de9fda081663b83f706bc SHA512 848e3b47d7c4a9dcbbe292fb59a351dcb00a60af2999e9d8be66a0a294f7f32e745fedbbad625e83707efcffeeae23ea4bd915c3f598c88185b9a0cb54fc95ac
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2
 DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
+DIST mgba-0.8.2.tar.gz 12014352 BLAKE2B 5a22d186b2732ba66698ac3fe47cd6ce841ca36ba856e5344948cf14a73aa9368658d94f0e6fb4fd78ae0a454c6d534182ecce221b3b24d62dde511c0aaa02a2 SHA512 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
 EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
-EBUILD mgba-0.8.0.ebuild 2525 BLAKE2B 4d4b24c5b4e0310505b3f779642c03f4455949f58f453542d0d210c9bf128959cccca9ddb15c9c246567fa340f95dca33762eb93cd03cc1b31428e13bea065b7 SHA512 e7cf1dd6e6283d819b59080a7812946fb290ab4534c2dab7c9feb4437dbc501f166f41f863668b3d23b9a620dc352ea57653e4d7fe129253902d0c62bbb59086
 EBUILD mgba-0.8.1.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
+EBUILD mgba-0.8.2.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
 EBUILD mgba-9999.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
 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
deleted file mode 100644
index d89828976cd2..000000000000
--- a/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/mgba-0.8.0.ebuild b/games-emulation/mgba/mgba-0.8.2.ebuild
index c8853a7ffd1b..be2689f439b2 100644
--- a/games-emulation/mgba/mgba-0.8.0.ebuild
+++ b/games-emulation/mgba/mgba-0.8.2.ebuild
@@ -41,10 +41,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-no_sdl.patch" #707578
-)
-
 src_prepare() {
 	xdg_environment_reset
 	cmake_src_prepare