gentoo resync : 23.03.2018

8 files changed, 126 insertions, 34 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 332bf5be8d25..746cda8554e8 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
index a2f48b0e9f09..fb6a471f2117 100644
--- a/games-emulation/mastergear-bin/Manifest
+++ b/games-emulation/mastergear-bin/Manifest
@@ -1,3 +1,3 @@
-DIST MG20-Linux-80x86-bin.tar.Z 160293 BLAKE2B 5c93ac1536855cc9446888d85dc06a3cf4066d8db089affc123ee495b2c0886c341ff4063e7239275e928b0ba386191cc529f75996950e54e042c1f532d82e1b SHA512 378d12d0977d773bf3aab0a4f138ea13b8ceff4db198849b8447e35ff1c43f9a997d7ee9b3bd2515fa40d4e462ea4dde3c0c8ef52a3680c67ea88db98889b7b4
-EBUILD mastergear-bin-2.0.ebuild 565 BLAKE2B 80ebd8d0c095056d883d43f7b94215d951ce11306183532e35618d9d0e68997e28a1a75804595c5c3016f92e86d5ae8395c99a94af433b98b141ce37f6e76658 SHA512 634bf87ad096b148ffbf35a6eb48725dbd1ef095dfe0d007c66e405eadc7db48be5e21b6b8fafabc23df033d7d4e202ecfe752737bdd4b7d86495a2a70d8ea81
+DIST MG42-Ubuntu-x86-bin.tgz 169020 BLAKE2B 8c554e1be2e01ea922a67de86d6d8eafdd7ee0f1f991ace095d36a7bd949371e0ad7dd22ee14ef2e8eed0da13b0aa5cbef45ae18316bd0661a5e450f3a9e5700 SHA512 25a88cc13c6baf336732f3ad77d2ab3c0c1097ed79b081f9f1b904477e2f362ba56e1797330dedad2df5d4fdb405ddc38ed76b19d53f4e4e74dbeded30d05b47
+EBUILD mastergear-bin-4.2.ebuild 573 BLAKE2B 0ea3f09fa2af2f479b53fe8c2456ce1f3c3036e9223c4afda88f35e051944d8266dc0d3428e5ca4d6fa7600f355843b3783fd1f4166d1af2f251845f6ef4ffb7 SHA512 2e2f2b376a1cb72bacc5e6210685fc0689ef6a3c8a69e8b928d10b2f3448d06946e5efbc54f7d5ccea67dc7cf7a04cc98acd4804a3240202805e71ea6c927571
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild b/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
deleted file mode 100644
index 768fde9f3d92..000000000000
--- a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="SEGA Master System / Game Gear emulator"
-HOMEPAGE="http://fms.komkon.org/MG/"
-SRC_URI="http://fms.komkon.org/MG/MG${PV/\./}-Linux-80x86-bin.tar.Z"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="x11-libs/libXext
-	sys-libs/zlib"
-
-S=${WORKDIR}
-
-src_install() {
-	dogamesbin mg
-	insinto /usr/share/doc/${PF}
-	doins CART.ROM SF7000.ROM
-	dohtml MG.html
-	prepgamesdirs
-}
diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.2.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.2.ebuild
new file mode 100644
index 000000000000..0a972400ab11
--- /dev/null
+++ b/games-emulation/mastergear-bin/mastergear-bin-4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="SEGA Master System / Game Gear emulator"
+HOMEPAGE="https://fms.komkon.org/MG/"
+SRC_URI="https://fms.komkon.org/MG/MG${PV//\./}-Ubuntu-x86-bin.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND=">=sys-libs/glibc-2.15
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	|| ( media-sound/pulseaudio media-sound/apulse )"
+
+S="${WORKDIR}"
+
+src_install() {
+	dobin mg
+	docinto html
+	dodoc MG.html
+}
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 5a1d4154248f..b1f7690180f9 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,6 +1,8 @@
 AUX vbam-2.0.1-changelog-update.patch 3547 BLAKE2B cd9c3aaab79e4342d7bdbc903331ef0d7fd54b63422715e8d0dfe27cbbfcc729804ec018beb434faa9b89ca5bce417f382debfc74b111a5dae4e8974e2cec38f SHA512 792ad5848a373a0a5040132417e7a9eb4cccf3155e31beda61b6236edc80ce74018ad8d7bd67829c981b60a8940904629c64b3d392ca25d0bb58461d64e228e3
 AUX vbam-2.0.1-read-version-from-changelog.patch 2701 BLAKE2B cf9c826bc75fb956becb99decadc36e41a1944b64095729826e732341c36aef1df9ef73b424501e9d0dcb9e8146d50c0b91641237b2b3c83e13d2bb2ab375311 SHA512 2a1793c8c4f0dff020337eccc9ff94c357b8f1ce2dde8aab612c4a06b5adbfbf3261b91643bfdab958ddf77f2e5f751997840cdcd89dd4d77744de8caf1f4285
 DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
+DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
 EBUILD vbam-2.0.1-r1.ebuild 2243 BLAKE2B b76bb006b86d23077c09481277340c18dd06275cd8ceb0ae374d0fa4075cdce036950013787f74babd8730539faca14afd83e0878503a9901f2552d473df3387 SHA512 c49c9d5c71cef41b194a5ed229c2ec6405b2268a83e86ff654e183e598c6170f74628a1f187bc89faf06a258738f7109df4a956718a9e830caea8648cc86299c
+EBUILD vbam-2.0.2.ebuild 2133 BLAKE2B 7cb6802db60dfb7e6686d6daa6c52d9bfa477ffd78b77b78a8c3bd955a6563950eab13ba762d99c4f7a1f466cfe224927c884fceb5144afd6a44e7c7edf8e269 SHA512 2026cbe925ea3159a82b47c1be373ef37e5236661fe15bd1f4d191073da3fab04e23cf7fac5d6540f03f3b29066119787c5d95270baad23ab9b260087c288e6c
 EBUILD vbam-9999.ebuild 2133 BLAKE2B 7cb6802db60dfb7e6686d6daa6c52d9bfa477ffd78b77b78a8c3bd955a6563950eab13ba762d99c4f7a1f466cfe224927c884fceb5144afd6a44e7c7edf8e269 SHA512 2026cbe925ea3159a82b47c1be373ef37e5236661fe15bd1f4d191073da3fab04e23cf7fac5d6540f03f3b29066119787c5d95270baad23ab9b260087c288e6c
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
new file mode 100644
index 000000000000..53f480e326ee
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.0.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
+	media-libs/libsdl2[joystick]
+	link? ( >=media-libs/libsfml-2.0:= )
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( media-video/ffmpeg:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	wxwidgets? ( virtual/imagemagick-tools )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 8a2221d1e90c..e88d7f3c3986 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -11,5 +11,5 @@ AUX zsnes-1.51-libpng.patch 854 BLAKE2B 31a5e086fb108cd2a2c6004989974d053121b7fb
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
 AUX zsnes-1.51-stack-align.patch 305 BLAKE2B 41d4a152d6824138caf2a0d62ed5dbdabacda546ad5a6043abfa7c93bd07945e9e02fb14e5278426f7c0f65aa430c6f4234505c1ec17a2b35fd82880f73929bd SHA512 632016ee78c62b02266f81ddde77c06ffaaffbbaa95d56a28b7830aec1befa2dd6a836a589ff6785a9971608a212868bf73a6a41bef2b348ab138cd03834f37b
 DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r4.ebuild 3235 BLAKE2B 3f4564cc5d700b9811b4a6665401cc92466e95c323edfd810d165f7e89054f85d0efad4f35b708e66061ba9dc1a36072d09719b74d69711152b17b38381341af SHA512 b31372ede610e95d5ec82d8168c55d29b5bb250ca91b25481c6cca1a9e86f7a258c3b0324a2ab524221e8399c11158033b395474df06f6b528a93e17309b0f20
+EBUILD zsnes-1.51-r5.ebuild 3200 BLAKE2B 8399ddf8f386501b5f9322cb7aa47abbdaca29f46b6a25060f28e142eca7b2eaa7b3eb6643eeaba68a80bd1c358c8fbe8882592f340e6efd07803e9267e356cf SHA512 0493c4cbb3095d9231b668310e9bc64f09f8ce86f54ca3b05a0d5825f6405766bc2d7c1f91399d2406c46df864b44a073517c2da3751ecaa8414052957387285
 MISC metadata.xml 484 BLAKE2B ad2da7cec97ca32be7ae42000312cdebd1c5dc5fce4ccc6f99fd16e69208350a5e714201e0bc258e8d4eb980357fe2517cc9b177e3ad74507b44d31ecdc8fe27 SHA512 02318871d54bfa7d9c4ba2a64f3ed7c83bf45b04a5c66dda5659d935b943a2415e6eaad124ac34e3c4235ba57f21c1189b03fec4f622c19eec1873531727a622
diff --git a/games-emulation/zsnes/zsnes-1.51-r4.ebuild b/games-emulation/zsnes/zsnes-1.51-r5.ebuild
index 9f5ce6ababe5..5787c4659bc4 100644
--- a/games-emulation/zsnes/zsnes-1.51-r4.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,8 +22,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
-	debug? ( virtual/pkgconfig )
-	amd64? ( >=sys-apps/portage-2.1 )"
+	debug? ( virtual/pkgconfig )"
 
 S=${WORKDIR}/${PN}_${PV//./_}/src