gentoo resync : 05.04.2018

8 files changed, 85 insertions, 44 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index aa460fee76ab..c8318aa5c758 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 981f8dd0f18a..377ab85a7308 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,5 +1,6 @@
 AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b3669166f1ee04d26e6538a392e494d356b2eeabd43ac69fe9489ddeda146054ab5d1f821b3a52719d58ae493ca870f46461eacaab26ffb9eba1 SHA512 f7d5f4ac4d96f244aa6ee81a90f64e754aceebf075f1c4ff84dde2d1d2beaf617631569c5aa9a8afb40ae4499067e2233ba00a4b9d606a9608915714766d0bff
 AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd
+AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f
 DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
-EBUILD desmume-0.9.11-r1.ebuild 754 BLAKE2B f0d9f22299807ecbdd0f8ad2181dddadb21b78eaca6ba4689c9a3d0792e6c63e8b5727d322bf91bdd55fd819c795d43ab6da4a6e8b75dfceaed4206186442b07 SHA512 dd0b758b2d8ff5baf3bad5fd6497c8cd2d5f0421726cf1d80326cb5919d271b404be3e79b6cc373ef593e4b9ccc8f0967c3d77997bf01780cdb40786e7fca82e
+EBUILD desmume-0.9.11-r1.ebuild 800 BLAKE2B 5cf60a8343d47e2e7adce5697fe8904bc733f503d9d56a37515708def52dd403ae52bec61b20bb6183335266e61916b2d0591e6f89ca20ce5cdbff76c565cbd6 SHA512 91fc616b3935e92f6b1f88346a47b6683835d02a2a35f32fc2b2d127971546fe45ef3af8d1d690f9e39b595f51c405664cf29ae9b62e63f024e8c98214786e7d
 MISC metadata.xml 407 BLAKE2B a64ba166734f13f34fec0ca394d4d51bc70f2cb9539981e068e544f3139584ee3ec2da89a02ef9203008cb73213213adb148c978311ae36d95749e553d10605b SHA512 89d3a5b608525bfa1f05503017619520d82c663241668c3d5fa5602e625cbfe02564b04d7bac0e97bbe53ff8eba08a6895fb0e8cd519d0d88efd29a0ca64ac4b
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
index cddcc940a314..e98e0846012b 100644
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit xdg
+
 DESCRIPTION="Nintendo DS emulator"
 HOMEPAGE="http://desmume.org/"
 SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
@@ -12,17 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
+RDEPEND="
 	dev-libs/zziplib
+	gnome-base/libglade
 	media-libs/libsdl[joystick,opengl,video]
-	x11-libs/agg"
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/agg
+	>=x11-libs/gtk+-2.8.0:2
+	x11-libs/gtkglext"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog README README.LIN )
 
@@ -31,4 +34,5 @@ DOCS=( AUTHORS ChangeLog README README.LIN )
 PATCHES=(
 	"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
 	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-gcc7.patch"
 )
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
new file mode 100644
index 000000000000..8b8a67f2291a
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/646352
+Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch
+
+From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
+From: rogerman <rogerman@users.sf.net>
+Date: Mon, 17 Aug 2015 21:15:04 +0000
+Subject: Fix bug with libfat string handling.
+
+diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
+index 765d7ae5..b6d7f01f 100644
+--- a/src/utils/libfat/directory.cpp
++++ b/src/utils/libfat/directory.cpp
+@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len
+ 	int bytes;
+ 	size_t count = 0;
+ 
+-	while (count < len-1 && src != '\0') {
++	while (count < len-1 && *src != '\0') {
+ 		bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
+ 		if (bytes > 0) {
+ 			*dst = (ucs2_t)tempChar;
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
 }
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index a8e5b3859f25..6d83249d761d 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -3,4 +3,4 @@ AUX sdlmame-0.174-qt.patch 829 BLAKE2B be945301fb35135f12bcd63eafaa72cc3b4d52f73
 AUX vector.ini 116 BLAKE2B 7dbc58708e0c371c6d8116891a37048d5477b1b92b61c26441f15fff81f8dd01bf8f49cc1bddd256c56ecba592a8dac5fb1674fab5f0adb488410dc6e1d13025 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f
 DIST mame-0.174.zip 95944685 BLAKE2B e97027edf7be293e599499bd428c663c1fc13498e2fe10ee356aa56ef8ba85d6ea003ba65a8cbc41d1159246eed354585fc18bf9507b47dc1774b87f5737b48d SHA512 9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
 EBUILD sdlmame-0.174.ebuild 6334 BLAKE2B 4f9d9dca92e57a723bc1744d2977ee4562fd7b2c16aac9a9ebfa1b257c82537d1cd53d3e3fad4485f4294241f8a92cfb3b1038095d698baecc665c7f6d11da0d SHA512 e9b8a1e8e96f89470e456581e0d7a2cd4d51928ea6a333f1883e8cdf380d84d747a8b4f247d31339337f3f0fbf492e3b140517735b34f96c85d2066d0dfe727c
-MISC metadata.xml 1573 BLAKE2B 2bb3f53a9dc2e3e3e511b81fb1319926d7f6fb68a6d6ed9dbcc0e56f106a5536f97200ab144c46ffa69d09cbce147b28f9468092d338c6c332ad607524ca1172 SHA512 a621863a22333f29886464b354f0efe7edc372ec598beec36ee3c0358846527e677a644b7ac24e1757c9f684f69c996a9cf74988643d015b3a34f3cbfa23c7e4
+MISC metadata.xml 1574 BLAKE2B 2d3e905abf49766f07570dcf385cd2001e7de8af5eaedca80a700208108c3eb7d59dd6a497469513e23f3734f8a7b64ad54f191847cc2fc8e3aed4752b5cf65f SHA512 390af6a62a54f4b49a669cc29a247fed9edc4c8ed6ddb973799ca4071e33c37a7f3eb6b64c6fbfb3e69266cd26da3c77762a37e2975724806b4352fa8ba124b5
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
index 86abf7105c06..d94f41033e1b 100644
--- a/games-emulation/sdlmame/metadata.xml
+++ b/games-emulation/sdlmame/metadata.xml
@@ -6,18 +6,22 @@
     <name>Gentoo Games Project</name>
   </maintainer>
   <longdescription>
-SDLMAME is a port of the popular MAME[tm]. There are a few principles that guide it's development:
+SDLMAME is a port of the popular MAME[tm].
 
-1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with as few changes as
-possible to the base Win32 code. This means we can track changes faster than larger more conventional
-ports such as MacMAME, and we also maintain what I call "Firefox compatibilty" where learning a major
-app only needs to be done once per application, and it then applies across many operating systems. If
-you can use the command-line Win32 MAME, you already know how to use SDLMAME on any platform you may
-encounter it on.
+There are a few principles that guide its development:
 
-2) MAME developers are important. By keeping quickly up to date, we make it easy for people on
-non-Windows platforms to make and submit changes to the core MAME code, and we offer native
-implementations of MAME's multi-window GUI debugger on both Linux/Unix and Mac OS X.
+1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with
+as few changes as possible to the base Win32 code. This means we can track
+changes faster than larger more conventional ports such as MacMAME, and we also
+maintain what I call "Firefox compatibility" where learning a major app only
+needs to be done once per application, and it then applies across many
+operating systems. If you can use the command-line Win32 MAME, you already know
+how to use SDLMAME on any platform you may encounter it on.
+
+2) MAME developers are important. By keeping quickly up to date, we make it
+easy for people on non-Windows platforms to make and submit changes to the core
+MAME code, and we offer native implementations of MAME's multi-window GUI
+debugger on both Linux/Unix and Mac OS X.
   </longdescription>
   <use>
     <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>