gentoo (leap year) resync : 29.02.2020

10 files changed, 60 insertions, 70 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 4df043b09385..c3d192e1eb6d 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 6744862bded7..763c6f2f7a09 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,5 +2,5 @@ AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179
 AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
 DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-3.1.0-r1.ebuild 1924 BLAKE2B 1c8052ca2727150a60268f23e470dfbe005da9d8393cb551ccc2bc010350ef8dd07736c464d729bf055c6d821a3c8675187dd27e0fbe7426d44d3c12f9f8a5a3 SHA512 a147d43fff75b674719f319ca8b3d71331fabb8a76f8efbf814475df0f0896e26f195d7d164bfa552ae10caa7afc2f3116a5b1e9efbec40735e354d5e477979e
+EBUILD atari800-3.1.0-r1.ebuild 1923 BLAKE2B c45ea37a93eae7cc5210eff2881cf49551efc0ecb0a3389e01f87018d351d37c192b5eb7069632bb4bbed7798c6a22bf7195d45528d8ac90896f050d64098379 SHA512 1441786da84d3aef99245c94c266380faff56b3be2a34c767b023ef22467e5d450d7c8a99371ef187238cfa81bbb7a571535b8877cf6c650480b225b1792b833
 MISC metadata.xml 1020 BLAKE2B 7c82700f98deef24331b65ec790956f3944fc2ad74f670e93babf9e129044fa126f71f961d609034b527a14cc1e052e47fe95eacf33ac7e0feeacf8e89540a07 SHA512 4e1ac81b84a99cff88a4ee5d18a761fe7c44107787b3f3576e45668c4496750557d47aed60311496318da449554f367896f9bc112260af414a0221e66595e176
diff --git a/games-emulation/atari800/atari800-3.1.0-r1.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
index 9373e100a2a7..559671226b0e 100644
--- a/games-emulation/atari800/atari800-3.1.0-r1.ebuild
+++ b/games-emulation/atari800/atari800-3.1.0-r1.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=6
@@ -79,7 +79,7 @@ src_compile() {
 	emake -C src
 }
 
-src_install () {
+src_install() {
 	dobin src/atari800
 	newman src/atari800.man atari800.6
 	dodoc README.1ST DOC/*
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 41c69355399f..04f41b15e5e6 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,10 +1,9 @@
-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.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
+DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
+EBUILD mgba-0.7.3.ebuild 2479 BLAKE2B 13c131f9073caef9a9aad3f0df1ae9a97fe424bd7595d95e821bcdc0983daff8a5902ca41191744b8104ce1fa1ea76f926f19e9c325fd5a6b42802b2a68e6ea1 SHA512 43b04d3c46ea1390653302b2bb8890d8db4cf6bc1f226b1863096272d5cf0e01fe46e0232f47f4e5d597e6510ed4ef671127c3753510c5c959d5fbac9906943c
 EBUILD mgba-0.8.0.ebuild 2579 BLAKE2B e1cbd44cc6400193eee9b41866ac582258d5be07d7c64b9e4b03845023ea6170a759d66b564de8dd3738a3c1493563c5cd0c18c0f1414c17a7cf872557562cba SHA512 d09c0620feb178d48a485ab15701e16b3f72a42b757402a75b7251965f317c912dc07cfe9ed9aa8e8a89d1fe7a81a04d1e47d6827671a9b1b80e4c1fe23e2197
+EBUILD mgba-0.8.1.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65
 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.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
deleted file mode 100644
index 05368f6e30e7..000000000000
--- a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-Date: Fri, 25 May 2018 18:04:16 -0700
-Subject: [PATCH] Qt: Fix build with Qt 5.11
-
----
- src/platform/qt/LoadSaveState.cpp | 1 +
- src/platform/qt/Window.h          | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp
-index a381c3d22..41ddb842e 100644
---- a/src/platform/qt/LoadSaveState.cpp
-+++ b/src/platform/qt/LoadSaveState.cpp
-@@ -10,6 +10,7 @@
- #include "GamepadButtonEvent.h"
- #include "VFileDevice.h"
- 
-+#include <QAction>
- #include <QDateTime>
- #include <QKeyEvent>
- #include <QPainter>
-diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
-index c009c7ffa..8ee63907d 100644
---- a/src/platform/qt/Window.h
-+++ b/src/platform/qt/Window.h
-@@ -6,6 +6,7 @@
- #ifndef QGBA_WINDOW
- #define QGBA_WINDOW
- 
-+#include <QAction>
- #include <QDateTime>
- #include <QList>
- #include <QMainWindow>
diff --git a/games-emulation/mgba/mgba-0.7.3.ebuild b/games-emulation/mgba/mgba-0.7.3.ebuild
index 759399b0d4b9..9f37db304634 100644
--- a/games-emulation/mgba/mgba-0.7.3.ebuild
+++ b/games-emulation/mgba/mgba-0.7.3.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
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
 else
 	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.8.1.ebuild
index fa5245675b20..1200fa57ed49 100644
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ b/games-emulation/mgba/mgba-0.8.1.ebuild
@@ -1,30 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake desktop xdg
 
 DESCRIPTION="Game Boy Advance emulator written in C"
 HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
+else
+	MY_PV="${PV/_beta/-b}"
+	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg imagemagick libav opengl qt5 +sdl"
+IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
 RDEPEND="
-	dev-db/sqlite:3
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	elf? ( dev-libs/elfutils )
 	ffmpeg? (
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	imagemagick? ( media-gfx/imagemagick:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5
@@ -34,15 +40,13 @@ RDEPEND="
 		opengl? ( dev-qt/qtopengl:5 )
 	)
 	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-qt511.patch"
-)
-
 src_prepare() {
-	cmake-utils_src_prepare
+	xdg_environment_reset
+	cmake_src_prepare
 
 	# Get rid of any bundled stuff we don't want
 	for pkg in libpng lzma sqlite3 zlib ; do
@@ -58,30 +62,30 @@ src_configure() {
 		-DBUILD_QT="$(usex qt5)"
 		-DBUILD_SDL="$(usex sdl)"
 		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
+		# test suite fails to build (>=0.6.0)
 		-DBUILD_SUITE=OFF
 		-DBUILD_TEST=OFF
 		-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
 		-DUSE_FFMPEG="$(usex ffmpeg)"
 		-DUSE_GDB_STUB="$(usex debug)"
 		-DUSE_LIBZIP=OFF
 		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
 		-DUSE_MINIZIP=ON
 		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.3)
-		-DUSE_SQLITE3=ON
+		-DUSE_SQLITE3="$(usex sqlite)"
 		-DUSE_ZLIB=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
@@ -89,7 +93,7 @@ src_install() {
 		dobin ../${P}_build/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256; do
+		for size in 16 24 32 48 64 96 128 256 ; do
 			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
 		done
 	fi
@@ -103,20 +107,18 @@ src_install() {
 
 pkg_preinst() {
 	if use qt5 ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
+		xdg_pkg_postinst
 	fi
 }
 
 pkg_postrm() {
 	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
+		xdg_pkg_postrm
 	fi
 }
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index c20fb46b5b8f..d650f0d670b1 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,3 +1,4 @@
+AUX mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch 520 BLAKE2B 1a72237a46105840d90e25a551e5ffab3f35f8df9f975da6f65c135847aac71fbf2e7fb9899c05720cb29b31ea85a15d86167c95993b93d763fea585ae0a4bff SHA512 95860397c764a6a21faaab45e13f68aa6b5da15ff1b96a430a263aaac918495b27a923c639166a9f124c0e3f3d2af6a3947aed34c3a590abc2e3033ef8460bd9
 DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
-EBUILD mupen64plus-core-2.5.9.ebuild 2457 BLAKE2B 3eaeaa88a5285a0b9fc1cc89075bb3f81cd2df36ee1523f921b63813eda4b527696aa258f3515b0f27c2242cedbab0ab702428c946dac2ec0f44cce103cebf4e SHA512 d321bc408fb8489c21b7c3e490faace7053d6d10c2c16a8912bdb2718e7047f882725581489069ba8879f49d1d5b33b05e258eb6fc6b7fa53017f260f83f2f5b
+EBUILD mupen64plus-core-2.5.9.ebuild 2523 BLAKE2B 52bd75d9456d3ea25404bd050623f0cea9a0667399415c6c13dfb7c14c10801e4ea5c37650aeaaec7d109b32e5a8c7c0bf76b7f3d7b2bd07737b41074d00c56a SHA512 f6aac01f3e0c9c3e6c5a48bcecb6d1373eb38afffb774a57ee6d4c6e0a353a200c21f71ed18cb989c067ba46e53f0f5a3e7bf68af65a6712b387d86730e432aa
 MISC metadata.xml 1042 BLAKE2B ef5f55643b1264d3c48e20f63df5a754c17f2dd4012bd6133c6bab0868ca3f8f4b00c309c041efead11ff64a783653d7df6c800d8eea504bfd7a3ba049b7f351 SHA512 a38ea381091a52abe63c786bae44191c0318dec24d2ed9d1db9b4d94b932441dc385adea652dbd82377cfb30bcb12d77ffbd44b41fddfcddbe289d084c59d132
diff --git a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..cfc7d5a9fb49
--- /dev/null
+++ b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/device/r4300/idec.h
++++ b/src/device/r4300/idec.h
+@@ -82,6 +82,6 @@
+ 
+ #define IDEC_U53(r4300, iw, u53, u5) (void*)(((char*)(r4300)) + idec_u53((iw), (u53), (u5)))
+ 
+-const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
++extern const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
+ 
+ #endif
+--- a/src/main/workqueue.h
++++ b/src/main/workqueue.h
+@@ -27,7 +27,6 @@
+ 
+ struct work_struct;
+ 
+-struct work_struct *work;
+ typedef void (*work_func_t)(struct work_struct *work);
+ struct work_struct {
+     work_func_t func;
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
index f7e5603250c8..5bf2f73d58f8 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="gles2? ( !osd )"
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
+
 src_prepare() {
 	default