gentoo resync : 05.04.2018

2 files changed, 34 insertions, 23 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 51830ab68c31..0ae9c98fac5d 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,6 +1,6 @@
 AUX mgba-0.5.2-imagemagick7.patch 2041 BLAKE2B cc3f8cb1dbee6a6917e8220798f9fcb69c02bfb76a49b8e5aef880b575d90d9247c20ef873178baff0b48917e8e89f1a00af61801dda70062b8f212bc65434fe SHA512 628912800231d1c084b55e52b63932e03ac127441cfffe8fb7d822a3abcbb15a038d8e1bfc50b4f36643f106d08c99cb3807c5de3e0d80a76074c82105c70a70
-DIST mgba-0.5.2.tar.gz 5343635 BLAKE2B 2e33e504da09b2cf9863c216f9569f155c85a9ba68209eac72ab849cc816d793a794fe92f2a9ed06065673de92b98ddb9ae0f8624ebb413aac6ecf639523c086 SHA512 8d3ef901bae9b503f8d5afff63c23be9af4b519f86cc6f3656c51374756107e4852bc0472cb7393cb04c8f0ff2f134367a81e32a5ff3dab8ae0c6cbd7d3858da
 DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
-EBUILD mgba-0.5.2.ebuild 2070 BLAKE2B 826b1b949e9d53591e7ef01945d0578e841d806672cb26ce38e204ef95ed96c4aa0d912683d993b95c60773689a7bf836c5e344d511e86418a439efa8420bdff SHA512 2d02395a1ac81d5a1da1aaaaa14c5a668e87a3ff2a6220a25b44158a25ee5ba8ff298a0b70a2240b462cb64b6e6aed5603c18efd88960055ffa2e569c56a4328
+DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
 EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
+EBUILD mgba-0.6.2.ebuild 2367 BLAKE2B d9b9d7779b6bcdcb82d883a0f1a6156111037603b04e7e417b7808b30f16f9ab6564145d56fc9534f54d591cde9229adc4e3fc47a34ec7ef41b4b01eb2783ec6 SHA512 97daec41ddf7d211c8ffcca2f6c5f53e7adf44cc02d7f7d35717a7fdb1c2d7d3f448f7df194386b0c168f6d63cbf85443eccddcdcda52d9d6b2384c5af3b56cb
 MISC metadata.xml 339 BLAKE2B e8edd01de74aa69c33c51ca095668dd89c74b83bd0c1597baf75f34b839cba3e74a2723b96acad0aef00b7a84628d54f70526f336a2d9880c32403cca153ca1d SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03
diff --git a/games-emulation/mgba/mgba-0.5.2.ebuild b/games-emulation/mgba/mgba-0.6.2.ebuild
index be3429d13af3..bae8265e6962 100644
--- a/games-emulation/mgba/mgba-0.5.2.ebuild
+++ b/games-emulation/mgba/mgba-0.6.2.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils cmake-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
-DESCRIPTION="A new Game Boy Advance emulator written in C."
+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"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="ffmpeg imagemagick opengl qt5 +sdl"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
 RDEPEND="
+	dev-db/sqlite:3
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
 	ffmpeg? ( virtual/ffmpeg )
@@ -29,19 +30,15 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		opengl? ( dev-qt/qtopengl:5 )
 	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-3.2.2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-imagemagick7.patch"
-)
+	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	cmake-utils_src_prepare
 
 	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma zlib ; do
+	for pkg in libpng lzma sqlite3 zlib ; do
 		rm -r "${S}"/src/third-party/${pkg} || die
 	done
 }
@@ -49,15 +46,29 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GL="$(usex opengl)"
+		-DBUILD_GLES=OFF
+		-DBUILD_PYTHON=OFF
 		-DBUILD_QT="$(usex qt5)"
 		-DBUILD_SDL="$(usex sdl)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_MAGICK="$(usex imagemagick)"
+		-DBUILD_SHARED=ON
+		# 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_EDITLINE="$(usex debug)"
 		-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
-		-DM_CORE_GB=ON
+		-DUSE_PNG=ON
+		# build fails with sqlite being disabled (0.6.0)
+		-DUSE_SQLITE3=ON
+		-DUSE_ZLIB=ON
 	)
 	cmake-utils_src_configure
 }
@@ -68,12 +79,12 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
+		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
 			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
 		done
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		dobin ../${P}_build/qt/${PN}-qt
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
@@ -91,14 +102,14 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if use qt5 ; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		gnome2_icon_cache_update
 	fi
 }
 
 pkg_postrm() {
 	if use qt5 ; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		gnome2_icon_cache_update
 	fi
 }