gentoo resync 08.09.2018

14 files changed, 92 insertions, 330 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 3e03ab002ce7..3556a1013e39 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index e349dec51066..4247baad2f0c 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -3,5 +3,5 @@ AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
 EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746
-EBUILD dolphin-9999.ebuild 4543 BLAKE2B 882e74a625f99b126af0c8ff5c047b0bc659d16f313f8a6b045eb5e746c7058e5f60b8506e1baa7979039e5a0c4a12476fed490752ad8663e92c7eb81b4dd063 SHA512 7a4578076ae71146edc596d1e67d6f6e4f290a3d33edffb980664bae3ec1aae1a2e04887ca95c71a3cd972059cc63dd3b638faf05904978739a1e3062e4a906c
+EBUILD dolphin-9999.ebuild 3913 BLAKE2B 5b704e3f68f5942cbbe11d8b1eeffbc4b614e179cd46120357111380f28338345acbbd65d1360e92ae8f0e137e27af21e01382e484651cbcb1a9567b7274384f SHA512 daec7f5ac7c3e113b18d5c83cfe0e30b09a796d15567472657c5ca38171a6781d9b5d718f822ebf4bf395b6d65e7c2681a584f42b280e23a1ef925dd94dafb21
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b8b2dd91a858..b22a98646b70 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -22,16 +22,16 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
+IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp"
 
 RDEPEND="
-	>=media-libs/libsfml-2.1
-	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1:=
 	dev-libs/hidapi:0=
 	dev-libs/lzo:2=
 	dev-libs/pugixml:0=
 	media-libs/libpng:0=
+	media-libs/libsfml
+	net-libs/enet:1.3
+	net-libs/mbedtls
 	net-misc/curl:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -41,7 +41,6 @@ RDEPEND="
 	virtual/libusb:1
 	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
 	bluetooth? ( net-wireless/bluez )
 	egl? ( media-libs/mesa[egl] )
 	evdev? (
@@ -52,11 +51,6 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	openal? (
-		media-libs/openal
-		media-libs/libsoundtouch
-	)
-	portaudio? ( media-libs/portaudio )
 	profile? ( dev-util/oprofile )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
@@ -66,7 +60,7 @@ RDEPEND="
 	)
 	sdl? ( media-libs/libsdl2[haptic,joystick] )
 	systemd? ( sys-apps/systemd:0= )
-	upnp? ( >=net-libs/miniupnpc-1.7 )
+	upnp? ( net-libs/miniupnpc )
 "
 DEPEND="${RDEPEND}
 	app-arch/zip
@@ -78,26 +72,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# Remove automatic dependencies to prevent building without flags enabled.
-	if use !alsa; then
-		sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
-	fi
-	if use !ao; then
-		sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
-	fi
-	if use !bluetooth; then
-		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
-	fi
-	if use !openal; then
-		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
-	fi
-	if use !portaudio; then
-		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
-	fi
-	if use !pulseaudio; then
-		sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
-	fi
-
 	# Remove all the bundled libraries that support system-installed
 	# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
 	local KEEP_SOURCES=(
@@ -141,19 +115,23 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_SHARED_ENET=ON
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-
+		# Use ccache only when user did set FEATURES=ccache (or similar)
+		# not when ccache binary is present in system (automagic).
+		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_BLUEZ=$(usex bluetooth)
 		-DENABLE_EVDEV=$(usex evdev)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
 		-DENABLE_LLVM=OFF
 		-DENABLE_LTO=$(usex lto)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_SDL=$(usex sdl)
-
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
 		-DUSE_EGL=$(usex egl)
+		-DUSE_SHARED_ENET=ON
 		-DUSE_UPNP=$(usex upnp)
 	)
 
@@ -176,12 +154,6 @@ src_install() {
 pkg_postinst() {
 	# Add pax markings for hardened systems
 	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-
-	if ! use portaudio; then
-		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
-		ewarn "USE=\"portaudio\""
-	fi
-
 	gnome2_icon_cache_update
 }
 
diff --git a/games-emulation/jrommanager/Manifest b/games-emulation/jrommanager/Manifest
index 3f08b8ef7900..94d4176ee718 100644
--- a/games-emulation/jrommanager/Manifest
+++ b/games-emulation/jrommanager/Manifest
@@ -1,5 +1,7 @@
 DIST JRomManager-1.6b20.zip 9284236 BLAKE2B a874837e90bdd8ec6c55850fd0e61cabeb767f4b4eba6517a11f3de036a6fd95f7507593da7b5247824c38077b12ac52c490f5ec0e72077bd972c78810c58ebd SHA512 5d4a98989bd9eb2ba94dd50fe451308d9a628414e33cdc84814c55bf9679c3779253a8fab895e2f7922e3b837949e8065f2799707aeaab94d79a12ba73d83638
 DIST JRomManager-1.7b24.zip 9293410 BLAKE2B e73456273e6b2ef960bf94f9c0b4f241829474187fbe7205f98f1bf03abfc3e5eeed4803303ede6e937168daf9eed0ea47499addc00eb153269e9228f4bded61 SHA512 e10ad63348d9eba20175b5d620b32876730900abbe2d8bf9add1ba58f2b7f1d54fbd5a94ec937ab8b94f69c29979302630f2e81cba8d10176b83ec65ba55333f
+DIST JRomManager-1.8b27.zip 9382160 BLAKE2B a7508d7beef0939c99c18688a07f4dd41e5bef00c8c27d2b3cc2e46089c99a0a1b90a8ff67050c3f4ea223d48c5b39615a2457a369dbd8484344d55244e79016 SHA512 a3688760565ef3a6514b433eeba5850352d5159ab27243053ebdf2280f8edd0d5cfb014859925c1a9c74bc873dfd18a871789a5d13a9a34a2582de89747b1561
 EBUILD jrommanager-1.6_p20-r1.ebuild 975 BLAKE2B e0c596f31ce3b26f834bd9005583b2169ee58b808074e740c697ed58d8bf8ec2fa99b63adaa0a202810ce606f471cb4a1a626929c063d64e20c49cbafee2bcc7 SHA512 a46bca65f51962fe62ce45c1bb9de81c5f5d8076a56126a83a1681aad0602453f826c266401d0424bee312c99295310a2aa1c980a200e60299d99134f00bf451
 EBUILD jrommanager-1.7_p24-r1.ebuild 981 BLAKE2B 942fd333aeebade8fc693b37f5924b35287d102506685af3d1f65e2f8e297ca9769cb8a1040bfa89b69736c1e20c886d43c64a1c8f37712c8651be9d12ed7e0b SHA512 fc03cffb6d8f2ac63235669b6245da08a5ef36de8e8457bd80d7c8125b71ffa2a4dd3f6b6ccff685969bab08b06d59e304ccc51175798a19d1d83dc02d1a450c
+EBUILD jrommanager-1.8_p27-r1.ebuild 979 BLAKE2B 397be5fbd18f6ed9ce5ef70a1be0cc1fb606093caecc6c8f8129741dc194ec0afe39342a56b8dc40586b77a94e31b4ac17030f1bea5358f996cac2ece65444f3 SHA512 f3a2a5e0fd3af976c1de234baed038f37bec3ffc6a49c06d61128e84695baa6720b405cbb0c164f180e1b404611422c097c12fb365320c6e8b53767ad54724a4
 MISC metadata.xml 831 BLAKE2B 814a9b1567202d8a7cf26370e0670a726ded26886231f46358a13b4538d4b4a048d09f116e1d6a743be16790b3aec8fc35911a2446fc851d8af48446255de334 SHA512 c7516078eb437a57048567be0d904c643a0860d6fee189cc92de1e300d15be1fc5143e42d2c2f8d412e893c8a00edc1db72fc7ef1c852ede33b120d84bf8986e
diff --git a/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild
new file mode 100644
index 000000000000..5a3f091d0147
--- /dev/null
+++ b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=JRomManager
+MY_PV=${PV/_p/b}
+MY_P="${MY_PN}-${MY_PV}"
+
+inherit desktop
+
+DESCRIPTION="A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro"
+HOMEPAGE="https://github.com/optyfr/JRomManager"
+SRC_URI="https://github.com/optyfr/${MY_PN}/releases/download/${MY_PV}/${MY_P}.zip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="${DEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	default
+
+	sed -e "/cd.*/s:.*:cd \"${EROOT}/usr/share/${PN}\" || exit:" -i *.sh || die "sed failed!"
+	unzip -j ${MY_PN}.jar "jrm/resources/rom.png" || die
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins *.jar
+	doins -r lib
+	newbin "${MY_PN}-multi.sh" "${PN}"
+	newicon "rom.png" "${PN}.png"
+	make_desktop_entry "${PN}" '' '' 'Utility'
+}
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index a2465372542c..225c5a8b6569 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,3 +1,4 @@
+AUX sdl-ttf.patch 383 BLAKE2B 78cea0b0c7dc1074022baadf3694adac1c809d3f280a8abef4038954f8fd486a71936a0f98a064eb8fdf8e8dfe82341016931ba52b43aa645f6c9d2a83768632 SHA512 e0d5259ce13254e53bd760130930bba96be977bc308a66c937e7fb68d42266cfa48775baf0df72d23f1c955c684dd73efdece4ef7e0398fe793e330c99edfbca
 DIST openmsx-0.14.0.tar.gz 3338719 BLAKE2B e9c09d29bb994f4f40e22271c090580688724cb7024910f0f829a59d0e65e6e70e1c037b943582aac644ee51a00b7e439e751bd84e5828168486b74ee09e8b78 SHA512 74a30de89b4a7cb4d8d5a0ad0c16ab6b58244251ebcbe470cc3cccec6a636492fa8779d1667d76646eabcf8d7d67c53094d5e0a313d452a4a679d797e9394a9b
-EBUILD openmsx-0.14.0.ebuild 1647 BLAKE2B 97b6ed516383c7162051dbf19ec1805b28b3df9a5845f44fd01a30a898b3078827a1a78026b3b113dd45f472f408d1d165e266b0bf2fa4746aa33e187f9cf27a SHA512 47f3bb94878edc3303c467a552262fed6c3aa0d539ef4a6981e9705b4e4166200126f6da93e1e1e6bcf78b38e102d5ebe22c2c5e9f93a0557cb21b2370e9fed9
+EBUILD openmsx-0.14.0.ebuild 1748 BLAKE2B 5a46938c0d955bab6b659747645293799c03b4c259da31b28efaf5b6014ddbfc9eb1d1db4f1fabbb607269e89a8624e5bdbc9ceb0cf009823ff10afd1eb9247a SHA512 457423e2350fac1d363ac33244556f20b1def51a2ed8623800d70619029d0ed960f3eca0d76730b74d14a4688a762dedf4123b206f286485e2eebf2d69f7bb0d
 MISC metadata.xml 330 BLAKE2B 0557bfe5901a6eb7331ad400d19b438dd3125b0af9426dd7c5bc369e3e5769677e645529b71c19797a57b4e3a43440a94664e80fa941e414a2b29e209382190d SHA512 0e2cbbe9308c1a43be6617797af0abe91bfa1dbb604ef9bc96dfb7c6c7310799c689ff7450afd9eb5b66d7aaeda878e0d046b404a0220b69b5dcf38be346e422
diff --git a/games-emulation/openmsx/files/sdl-ttf.patch b/games-emulation/openmsx/files/sdl-ttf.patch
new file mode 100644
index 000000000000..6ff469e509ed
--- /dev/null
+++ b/games-emulation/openmsx/files/sdl-ttf.patch
@@ -0,0 +1,12 @@
+diff -Naur a/build/libraries.py b/build/libraries.py
+--- a/build/libraries.py	2017-08-03 11:26:28.000000000 +0100
++++ b/build/libraries.py	2018-08-29 23:11:04.392981071 +0100
+@@ -304,7 +304,7 @@
+ class SDL_ttf(Library):
+ 	libName = 'SDL_ttf'
+ 	makeName = 'SDL_TTF'
+-	header = '<SDL_ttf.h>'
++	header = '<SDL/SDL_ttf.h>'
+ 	function = 'TTF_OpenFont'
+ 	dependsOn = ('SDL', 'FREETYPE')
+ 
diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
index 8b39565b4be2..42d560e04cdc 100644
--- a/games-emulation/openmsx/openmsx-0.14.0.ebuild
+++ b/games-emulation/openmsx/openmsx-0.14.0.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop readme.gentoo-r1
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="MSX emulator that aims for perfection"
 HOMEPAGE="http://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/${P}.tar.gz"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-lang/tcl:0=
@@ -23,7 +25,14 @@ RDEPEND="
 	media-libs/sdl-ttf
 	virtual/opengl
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/sdl-ttf.patch
+)
 
 DOC_CONTENTS="
 If you want to if you want to emulate real MSX systems and not
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index b1f7690180f9..56c2716bb884 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,8 +1,4 @@
-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
+EBUILD vbam-2.0.2.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
+EBUILD vbam-9999.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
deleted file mode 100644
index 6d4f87f2d772..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
-From: Zach Bacon <zachbacon@budgiemedia.rocks>
-Date: Thu, 12 Oct 2017 00:49:05 +0000
-Subject: [PATCH] Add a changelog
-
-Gonna try and keep this up to date as often as possible.
----
- CHANGELOG.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 81 insertions(+)
- create mode 100644 CHANGELOG.md
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-new file mode 100644
-index 00000000..c24ac560
---- /dev/null
-+++ b/CHANGELOG.md
-@@ -0,0 +1,81 @@
-+# Changelog
-+All notable changes to this project will be documented in this file.
-+
-+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-+
-+## [Unreleased]
-+
-+## [2.0.1] - 10/11/2017
-+### Added
-+- initial installer script
-+- gitter.im badge in readme
-+- 32bit cross compiling support on 64bit linux
-+- added support for GNUInstallDirs to cmake
-+- Include new translations from transifex
-+- Added WxWidgets ABI compiler check
-+- Add linux Joystick reference to issue template
-+- Add #ubckyde <cmath> fir std::cell()
-+- 
-+
-+### Changed
-+- Fix 2xSaImmx.asm linking issue
-+- cmake: default to ENABLE_ASM_CORE=OFF
-+- libretro merging from upstream libretro fork.
-+- better fix for clipped video in GL Fullscreen.
-+- Fix flibc crash: add log message on fopen failure
-+- fix gameboy header-detection in libretro interface
-+- hotfix for potential buffer-overflow
-+- delete memory in common/array.h on destruction
-+- SDL: improve error msg for unwritable config
-+- SDL: fix deflt bat saving, improve dir checking
-+- fix portability issue with strerror_r()
-+- Windows doesn't have sterror_r
-+- wx/wxvbam: fix GetAbsolutePath 
-+- fix a memory leak due to wrong syntax
-+- regenerate translation files
-+- fix errors reported by SUSE's post build linter
-+- SUSE Lint: fix a few classes of warnings
-+- let cmake escape -D preproc. definitions
-+- fix memory viewer xrc on wx 3.1+
-+- Improving README
-+- SoundSDL: lock conditional code cleanup
-+- remove the default F11 keybinding for save state
-+- hopefully fix resize artifacts on game panel
-+- soundSDL: write silence when paused
-+- cleanup SoundSDL  #139 #130 #97 #67 #65 #46 #47
-+- document how to provice symbolic backtraces
-+- "no throttle" fixes/cleanup
-+- only use -mtune=generic on x86/amd64
-+- installdeps: use -j$(nproc) not -j8 in info
-+- use -fabi-version=2 for GCC turn off LTO
-+- installdeps: minor refactoring/cleanup
-+- improve Wx GCC ABI check
-+- minor improvements for Wx Compile tests
-+- fix wx ABI check for Win32/MinGW
-+- installdeps: fedora fixes, including m32
-+- cmake: wx and cross compiling fixes
-+- restore wx 2.7 compat, improve string processing
-+- rename CMakeScripts/ to cmake/
-+- work around gcc lto wrappers bug with gcc 7.x
-+- update README.md
-+- remove doctoc title from README.md TOC
-+- improve win32 dependencies git submodule handling
-+- use num cpu cores to parallelize LTO link with gcc
-+- fix huge app icon in Win volume settings
-+- fix deadlock in SoundSDL:deinit()
-+- added executable extension for sdl binary
-+- default LTO to off on 64bit MinGW
-+- minor code cleanup
-+- deps: dont check result of apt-get update 
-+- read version and subversion info from Git
-+- fix error and version info in shallow git clones
-+- refactor/cleanup GitTagVersion.cmake
-+
-+### Removed
-+- Cairo Renderer: it never performed well to begin with
-+
-+
-+
-+[2.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/throttle...v2.0.1
-+
diff --git a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
deleted file mode 100644
index 5dce58395343..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46486381f0c18110002ec62108969be957b419be Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Wed, 11 Oct 2017 19:17:25 -0700
-Subject: [PATCH] read version info from CHANGELOG.md if no git
-
-If git tags are not available, set the version and revision by finding
-the first version tag in `CHANGELOG.md` of the form
-
-```
-```
-
-Where N.N.N is the number version (number of components can vary) and
-the revision (as speicified by -REV) is optional.
-
-TODO: support named revision without a version number of the form
-`[REV]`.
----
- CMakeLists.txt               |  9 +++------
- cmake/ChangeLogVersion.cmake | 25 +++++++++++++++++++++++++
- 2 files changed, 28 insertions(+), 6 deletions(-)
- create mode 100644 cmake/ChangeLogVersion.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd09527d..4ad859b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -112,15 +112,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-     # of files that depend on version.h
-     include(GetGitRevisionDescription)
-     get_git_head_revision(REFSPEC COMMITHASH)
--else()
--    message(WARNING "Git not found, cannot set version info")
- endif()
- 
--# no git or no tags
-+# no git or no tags, use ChangeLog
- if(NOT VERSION)
--    set(VERSION  2.0.0)
--    set(REVISION "unknown")
--    set(VERSION_RELEASE 0)
-+    include(ChangeLogVersion)
-+    changelog_version(VERSION REVISION VERSION_RELEASE)
- endif()
- 
- # generate version.h
-diff --git a/cmake/ChangeLogVersion.cmake b/cmake/ChangeLogVersion.cmake
-new file mode 100644
-index 00000000..101d23bd
---- /dev/null
-+++ b/cmake/ChangeLogVersion.cmake
-@@ -0,0 +1,25 @@
-+function(changelog_version version revision version_release)
-+    set(${version}         "" CACHE STRING "Latest ChangeLog Version"  FORCE)
-+    set(${revision}        "" CACHE STRING "Latest ChangeLog Revision" FORCE)
-+    set(${version_release} 0  CACHE STRING "Is this a versioned release without revision" FORCE)
-+
-+    file(READ CHANGELOG.md changelog_file)
-+
-+    if(NOT changelog_file)
-+        return()
-+    endif()
-+
-+    string(REGEX MATCH "\n## +\\[([0-9.]+)(-([^] ]+))?\\] +- +[0-9][0-9]?/" match_out "${changelog_file}")
-+
-+    set(changelog_version "${CMAKE_MATCH_1}")
-+
-+    set(is_version_release 0)
-+    set(changelog_revision "${CMAKE_MATCH_3}")
-+    if(NOT changelog_revision)
-+        set(is_version_release 1)
-+    endif()
-+
-+    set(${version}         "${changelog_version}"  CACHE STRING "Latest ChangeLog Version"  FORCE)
-+    set(${revision}        "${changelog_revision}" CACHE STRING "Latest ChangeLog Revision" FORCE)
-+    set(${version_release} "${is_version_release}" CACHE STRING "Is this a versioned release without revision" FORCE)
-+endfunction()
diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
deleted file mode 100644
index 7895e9c087d2..000000000000
--- a/games-emulation/vbam/vbam-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-changelog-update.patch
-	"${FILESDIR}"/${P}-read-version-from-changelog.patch
-)
-
-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/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
index 53f480e326ee..507362bca85e 100644
--- a/games-emulation/vbam/vbam-2.0.2.ebuild
+++ b/games-emulation/vbam/vbam-2.0.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 53f480e326ee..507362bca85e 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (