gentoo resync : 27.01.2018

8 files changed, 5 insertions, 125 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0ebc77cae879..83a67a93bf4e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/gxmame/Manifest b/games-emulation/gxmame/Manifest
deleted file mode 100644
index 337a61260bf5..000000000000
--- a/games-emulation/gxmame/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gxmame-0.35_beta2-glib-single-include.patch 367 BLAKE2B 3811541ba63a5ad1f1011438751d6512126c2b77431eee238dd53fd0ee46232e692885825d60495886d99cf93ee8e4df1fa1b469a258c12a5800ebbd9e1d519f SHA512 def963684ed246027dbb2613be4960ad103bd539ac8e8bdccfdea65899198be3052d7f8f89ade363a3d53e184ec0ea0d110f0d988bad5d5ec0cb54e159040319
-AUX gxmame-0.35_beta2-ovflfix.patch 1488 BLAKE2B dbc65e23b851e4120a33fd74b0df6fd003467f8e12d3ecccf00cf2e2350a8962ac846ef6364c508c0aa52589b39b1add8f555c29bbf6d42e154fa758e0202be7 SHA512 3c13151fbb1c285dc819413be3e049f089bc246bded77df02aafa950a1822d1f84e24206b07934fda079fd6f5ecc316335daee3b5516f2a8d87791bdd04eab40
-DIST gxmame-0.35beta2.tar.gz 697013 BLAKE2B 8c7396d716d6fded1c2bd3efbc5a90fc8c1835221c208f0e807b50044a2d9d6b392fa27349d9a7a51bcedf20544ff87940a2866fe4d6d6644c80d33aaa56bbe2 SHA512 c2b47c1f3f76d86846302754b31954b81d5b7165f5778153c6e6285bdcc6040c5479009cd70dcf32c86afa245ae8b6fe98af781f0d51acfcb76c8deb76422fe2
-EBUILD gxmame-0.35_beta2.ebuild 1829 BLAKE2B 6c402e94ecbac97a3d7492ddf8c0d2f2ec5e2e8d0668a7e05ab1df60145e1fda237e7e98e889a5f1eab6d2302edb775a4cf7477c5b793840a2a648d82243fa3d SHA512 9c13972407c7b9e4f1c8f109e4fd298c29f9ab7723c30ae70979de86cb4f8b56b88ecec47ea1bea3fb5ced55c900ab4bb5e54fb00b3bbe2f38e045f63f9e5267
-MISC metadata.xml 329 BLAKE2B 1111e8ca24c449b67e5eff40b4ace3df1caa88ae21795adcdad2dc5bcaf79f1e922cf68168818c3b388f7e716a68ba1150c3d2daaedcb1ab3ef47de2ab6a0ae6 SHA512 313bc1d6e61d610abbdd7e7a95826005e6160e5ea7dc4ca3fa58b9811fbd77cf33e33221526871bc2ac383f90d8676f2264629e4898fe92d1d26b5d84c878527
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
deleted file mode 100644
index 83ef4aa075e5..000000000000
--- a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gxmame-0.35beta2/src/gxmame.c
-===================================================================
---- gxmame-0.35beta2.orig/src/gxmame.c
-+++ gxmame-0.35beta2/src/gxmame.c
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <glib/gprintf.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkfilesel.h>
- 
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
deleted file mode 100644
index 8831a3e09b61..000000000000
--- a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/options.c.old	2010-12-01 10:48:45.000000000 +0100
-+++ src/options.c	2010-12-01 10:53:55.000000000 +0100
-@@ -4245,7 +4245,7 @@
- 		case XMAME_EXEC_SVGAFX:
- 			target->fxgkeepaspect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fxgkeepaspect_checkbutton));
- 			used_text = gtk_editable_get_chars (GTK_EDITABLE (fx_entry), 0, -1);
--			strncpy (target->resolution, used_text, 20);
-+			strncpy (target->resolution, used_text, sizeof(target->resolution));
- 			g_free (used_text);
- 			break;
- 
-@@ -4330,7 +4330,7 @@
- 	}
- 
- 	used_text = gtk_editable_get_chars (GTK_EDITABLE (soundfile_entry), 0, -1);
--	strncpy (target->soundfile, used_text, 50);
-+	strncpy (target->soundfile, used_text, sizeof(target->soundfile));
- 	g_free (used_text);
- 			
- 	target->timer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (timer_checkbutton));
-@@ -4465,7 +4465,7 @@
- 	target->skip_disclaimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (disclaimer_checkbutton));
- 	target->skip_gameinfo = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gameinfo_checkbutton));
- 	used_text = gtk_editable_get_chars (GTK_EDITABLE (debug_size_combo_entry), 0, -1);
--	strncpy (target->debug_size, used_text, 20);
-+	strncpy (target->debug_size, used_text, sizeof(target->debug_size));
- 	g_free (used_text);
- 	target->use_additional_options = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (additional_options_checkbutton));
- 	/* here I'm using directly the additional option because I don't know its length */
diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
deleted file mode 100644
index 58080b943381..000000000000
--- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P="${PN}-${PV/_beta/beta}"
-DESCRIPTION="frontend for XMame using the GTK library"
-HOMEPAGE="http://gxmame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gxmame/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls joystick"
-
-RDEPEND="dev-libs/expat
-	>=x11-libs/gtk+-2.4:2
-	>=dev-libs/glib-2.4:2
-	x11-themes/gnome-icon-theme
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glib-single-include.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	sed -i \
-		-e "s:-O2 -fomit-frame-pointer -ffast-math:${CFLAGS}:" \
-		-e "s:-O2:${CFLAGS}:" \
-		configure || die
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/Categories/s/Application;//' \
-		gxmame.desktop.in || die
-	sed -i \
-		-e 's:COPYING::' \
-		-e "s:^docdir = .*:docdir = /usr/share/doc/${PF}:" \
-		-e "s:^htmldir = .*:htmldir = /usr/share/doc/${PF}/html:" \
-		-e "s:^icondir = .*:icondir = /usr/share/icons:" \
-		-e "s:^pixmapdir = .*:pixmapdir = /usr/share/pixmaps:" \
-		-e "s:^gnulocaledir = .*:gnulocaledir = /usr/share/locale:" \
-		-e "s:^icon2dir = .*:icon2dir = /usr/share/icons/mini:" \
-		-e "s:^Graphicsdir = .*:Graphicsdir = /usr/share/applications:" \
-		-e "/DDATADIR/s:\$(datadir):/usr/share/pixmaps:" \
-		-e "/DPACKAGE_LOCALE_DIR/s:\$(datadir):/usr/share:" \
-		Makefile.in html/Makefile.in src/Makefile.in po/Makefile.in.in || die
-	sed -i -e 's/"gxmame"/""/' src/gui.c || die
-}
-
-src_configure() {
-	egamesconf \
-		--with-xmame-dir="${GAMES_DATADIR}"/xmame \
-		$(use_enable nls) \
-		$(use_enable joystick)
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" \
-		default
-	prepgamesdirs
-}
diff --git a/games-emulation/gxmame/metadata.xml b/games-emulation/gxmame/metadata.xml
deleted file mode 100644
index e5c3f321f04a..000000000000
--- a/games-emulation/gxmame/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gxmame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 185cf6b091f5..486176ae50fc 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -6,5 +6,5 @@ AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f3
 DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
 DIST higan_v099-source.7z 1012348 BLAKE2B db3eb7b8819532786e6f2dd664225abddc49d12cf5c525862578523240c76ab3ac2680537e04b347130ae7e821d1d98e6c4bf25cf47449567afd90887989aa0e SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6
 EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
-EBUILD higan-106_p1.ebuild 3097 BLAKE2B 5805587f88044b44b3d6858c049a5e3769d786db5e00522c88bb7a40bf73d63a5eb9f3c40f0600b2160b7273de90c7f199bb52c88565fee2515e203435fd06f8 SHA512 1208b4d5283bb8deb64b77bf8bf0dd8afb536475a0ff489ec83a8c3def50239e62d0ec9f3d264e20552f4ce899c00ae16c481078932bd9ba5dd92aae47c56061
+EBUILD higan-106_p1-r1.ebuild 3213 BLAKE2B 0b7dfc5a07055b96c3d8cbd4c936acf6137bcc77d6f906c675910f3e426c169636752d1f9cf33452af2156d345976e4003168377bca172302624d253db7e8519 SHA512 ac879d774978c2804c067e2434296e6d9ed42da7d37dbd2c332506c5eded6cbabe6bd8fe3b07597036bcd3fe784b463442e53d3d389758c0af9f43ed108d7a96
 MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/higan-106_p1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
index c0d5d2586aea..a39e0db7e729 100644
--- a/games-emulation/higan/higan-106_p1.ebuild
+++ b/games-emulation/higan/higan-106_p1-r1.ebuild
@@ -86,6 +86,10 @@ src_compile() {
 
 	mytoolkit="gtk"
 
+	# Needed for fluent audio (even on i5 hardware)
+	export CFLAGS="${CFLAGS} -O3"
+	export CXXFLAGS="${CXXFLAGS} -O3"
+
 	if use icarus; then
 		cd "${S}/icarus" || die
 		emake \