gentoo (leap year) resync : 29.02.2020

4 files changed, 33 insertions, 66 deletions

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
 }