gentoo resync : 24.12.2018

3 files changed, 27 insertions, 37 deletions

diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index cb6e231a98c8..988ff3b9fed4 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,8 +1,8 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
-AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
 AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
-DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
+AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1
 DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
-EBUILD snes9x-1.56.ebuild 2789 BLAKE2B 23180ff3ded88ad924eff4e9bebf5745c6e479e91552738b0afb5389d8dadc2bb22edd814d33f9d3fb01eeac2bf344d85dc159812b982b2e1b93e64c60efd991 SHA512 e121f01eba1b46e3b22cf5f2cf8878863a279aa4516ac71a46a30a5380f6fb75ad7979ac96a848f4e399191ac4ebdbed7844d4ee2c509c0baa8b359a1c72b017
+DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
 EBUILD snes9x-1.57.ebuild 2860 BLAKE2B d829620d8308791ea4c31dcc07c061baef25ea7203ab8a536db841a5b5a8213e98b939d990ec0ee071c83e12942ea2c4ef8dba36519f25b04cc7eb4de457c92a SHA512 b01974ee1d46b4e929890a81f847632ec73a364218da4e03a9c4030345e513ef8a3644c2d2e6d822a6ac7928aefb4147314aa6fdf38d1a570025752c574e3318
+EBUILD snes9x-1.58.ebuild 2749 BLAKE2B b3fd6d9771bce1debfb35fb7c4a4a43ebe98634c583879a8e8b9c4351142f748141a1f1cf34fecdbbb3f108545649400429fa0b34c0d2ff3fdb74160f3adc9ad SHA512 515d1718224ae25c259aa8d765d228851ba7cf2793d13e862581980116db8c4a2f4518f7479a30c71f2bdd83cbb56317d5c076ae33329d001f74d635c0b96650
 MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch
index 30811ef421e0..8a15e0aa4ee3 100644
--- a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
+++ b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch
@@ -1,32 +1,22 @@
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -33,7 +33,7 @@
+--- snes9x-1.58/gtk/configure.ac
++++ snes9x-1.58/gtk/configure.ac
+@@ -33,8 +33,8 @@
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.2])
  
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+-snes9xlocaledir='${prefix}/share/locale'
+-snes9xdatadir='${prefix}/share/snes9x'
 +snes9xlocaledir='$(localedir)'
- AC_SUBST(snes9xlocaledir)
++snes9xdatadir='$(datadir)/snes9x'
  
- AC_ARG_WITH(debug,
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -56,49 +56,6 @@
+ AC_SUBST(snes9xlocaledir)
+ AC_SUBST(snes9xdatadir)
+--- snes9x-1.58/unix/configure.ac
++++ snes9x-1.58/unix/configure.ac
+@@ -56,37 +56,6 @@
  # *** Execution begins here ***
  # *****************************
  
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
 -# Test what compiler flags we should use.
 -
 -AC_ARG_ENABLE([debug],
diff --git a/games-emulation/snes9x/snes9x-1.56.ebuild b/games-emulation/snes9x/snes9x-1.58.ebuild
index 652a1c859215..911de9a90fb0 100644
--- a/games-emulation/snes9x/snes9x-1.56.ebuild
+++ b/games-emulation/snes9x/snes9x-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio xinerama +xv"
+IUSE="alsa debug gtk multilib netplay nls opengl oss png pulseaudio portaudio wayland xinerama +xv"
 RESTRICT="bindist"
 
 RDEPEND="
@@ -22,12 +22,11 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	gtk? (
 		dev-libs/glib:2
-		dev-libs/libxml2
-		>=x11-libs/gtk+-3.0:3
+		media-libs/libsdl2[joystick]
+		>=x11-libs/gtk+-3.22:3[wayland?]
 		x11-libs/libXrandr
 		x11-misc/xdg-utils
 		alsa? ( media-libs/alsa-lib )
-		joystick? ( media-libs/libsdl2[joystick] )
 		opengl? (
 			media-libs/libepoxy
 			virtual/opengl
@@ -35,6 +34,7 @@ RDEPEND="
 		portaudio? ( >=media-libs/portaudio-19_pre )
 		pulseaudio? ( media-sound/pulseaudio )
 		xv? ( x11-libs/libXv )
+		wayland? ( dev-libs/wayland )
 	)
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
@@ -46,7 +46,7 @@ S="${WORKDIR}/${P}/unix"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.56-build-system.patch
+	"${FILESDIR}"/${PN}-1.58-build-system.patch
 )
 
 src_prepare() {
@@ -66,10 +66,10 @@ src_configure() {
 
 	# build breaks when zlib/zip support is disabled
 	local myeconfargs=(
+		--enable-gamepad
 		--enable-gzip
 		--enable-zip
 		--with-system-zip
-		$(use_enable joystick gamepad)
 		$(use_enable debug debugger)
 		$(use_enable netplay)
 		$(use_enable png screenshot)
@@ -86,14 +86,13 @@ src_configure() {
 			--without-gtk2
 			$(use_enable nls)
 			$(use_with opengl)
-			$(use_with joystick)
 			$(use_with xv)
-			$(use_with netplay)
 			$(use_with alsa)
 			$(use_with oss)
 			$(use_with pulseaudio)
 			$(use_with portaudio)
 			$(use_with png screenshot)
+			$(use_with wayland)
 		)
 		econf "${myeconfargs[@]}"
 	fi
@@ -107,11 +106,12 @@ src_compile() {
 src_install() {
 	dobin ${PN}
 
-	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
+	dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
+	dodoc snes9x.conf.default
 
 	if use gtk; then
 		emake -C ../gtk DESTDIR="${D}" install
-		dodoc ../gtk/{AUTHORS,doc/README}
+		dodoc ../gtk/AUTHORS
 	fi
 
 	docinto html