gentoo resync : 19.03.2019

4 files changed, 41 insertions, 65 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 272c8c0490a6..ce745f9217a4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 4acd3bf283fb..f2c639f3e233 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,9 +1,9 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
-AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
 AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1
 AUX snes9x-1.58-without-screenshot_build_fix.patch 846 BLAKE2B a8afca89a9d5a85df688610e2e136f1e47c1558f3be1a02585f47c075587993b68fbc29de987b7e791517a4584aa9373c4985dbdaed979e0688ae6cb3e5c9d58 SHA512 4cb91935d39766c091fdc30a5eb7b01eb60e29ea365da75968b5302d1f44be6992f46c04ba91af412edc787ddd0738ac8455d7127fbfe79ba7782abc423bab32
-DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
+AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
 DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
-EBUILD snes9x-1.57.ebuild 2860 BLAKE2B d829620d8308791ea4c31dcc07c061baef25ea7203ab8a536db841a5b5a8213e98b939d990ec0ee071c83e12942ea2c4ef8dba36519f25b04cc7eb4de457c92a SHA512 b01974ee1d46b4e929890a81f847632ec73a364218da4e03a9c4030345e513ef8a3644c2d2e6d822a6ac7928aefb4147314aa6fdf38d1a570025752c574e3318
+DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
 EBUILD snes9x-1.58.ebuild 2804 BLAKE2B d30b3e06951e3889fcecd1bca0cac88b76e71ae3bba163accc08a0e9f6a1b3899684fd9b26ec39b703d9cb63065431c1e8d69500570aa4068079195039f39471 SHA512 057b2dca88e954bb497a181d4cd1f8ed729b210e8847807083c89f33ee4f5a5eef5f4d9fe073ae0d835bdcc0dd3dfd50cb2eb23b680364fd818af03f43c67320
+EBUILD snes9x-1.59.2.ebuild 2733 BLAKE2B bc82044f56a1d76139f9ed41ffb3589847b5bc05add7f7249f93fb66b16f8b675c6c7b9b8653eadbab749ce42350bffe899645b1a4d101c15efa3c569a11980e SHA512 8ec0ed922e890f8dc5011073e54dfe9c030c5a0bd071c81ed4e9f50fd98886fa4a11c5ec405806b0ecbc7edcc871ada63d889db58a486108d1df8239e2d418e3
 MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
diff --git a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
index d2ee182cb7cd..2d8f9f05e59f 100644
--- a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
+++ b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
@@ -1,18 +1,5 @@
---- snes9x-1.56/gtk/configure.ac
-+++ snes9x-1.56/gtk/configure.ac
-@@ -33,8 +33,8 @@
- 
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
--snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
-+snes9xlocaledir='$(localedir)'
-+snes9xdatadir='$(datadir)/snes9x'
- 
- AC_SUBST(snes9xlocaledir)
- AC_SUBST(snes9xdatadir)
---- snes9x-1.56/unix/configure.ac
-+++ snes9x-1.56/unix/configure.ac
+--- snes9x-1.59/unix/configure.ac
++++ snes9x-1.59/unix/configure.ac
 @@ -56,37 +56,6 @@
  # *** Execution begins here ***
  # *****************************
diff --git a/games-emulation/snes9x/snes9x-1.57.ebuild b/games-emulation/snes9x/snes9x-1.59.2.ebuild
index 5792fa5ac7e7..830686b140fa 100644
--- a/games-emulation/snes9x/snes9x-1.57.ebuild
+++ b/games-emulation/snes9x/snes9x-1.59.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+inherit autotools flag-o-matic meson xdg
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
@@ -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 wayland xinerama +xv"
+IUSE="alsa debug gtk multilib netplay 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
+		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
@@ -39,26 +38,24 @@ RDEPEND="
 	)
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( dev-util/intltool )"
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${P}/unix"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.56-build-system.patch
+	"${FILESDIR}"/${PN}-1.59-build-system.patch
 )
 
 src_prepare() {
-	cd "${WORKDIR}"/${P} || die
+	cd "${WORKDIR}/${P}" || die
 	rm -r unzip || die
 	default
 	cd unix || die
 	eautoreconf
-	if use gtk; then
-		cd ../gtk || die
-		eautoreconf
+	if use gtk ; then
+		export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
 	fi
 }
 
@@ -67,10 +64,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)
@@ -79,41 +76,39 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 
 	if use gtk; then
-		cd ../gtk || die
-		myeconfargs=(
-			--with-gtk3
-			--with-zlib
-			--with-system-zip
-			--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)
+		local emesonargs=(
+			-Dalsa="$(usex alsa true false)"
+			-Ddebugger="$(usex debug true false)"
+			-Dgtk2=false
+			-Dgtk3=true
+			-Dopengl="$(usex opengl true false)"
+			-Doss="$(usex oss true false)"
+			-Dportaudio="$(usex portaudio true false)"
+			-Dpulseaudio="$(usex pulseaudio true false)"
+			-Dscreenshot="$(usex png true false)"
+			-Dsystem-zip=true
+			-Dxv="$(usex xv true false)"
+			-Dzlib=true
+			-Dwayland="$(usex wayland true false)"
 		)
-		econf "${myeconfargs[@]}"
+		meson_src_configure
 	fi
 }
 
 src_compile() {
 	emake
-	use gtk && emake -C ../gtk
+	use gtk && meson_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}
+	if use gtk ; then
+		meson_src_install
+		dodoc ../gtk/AUTHORS
 	fi
 
 	docinto html
@@ -121,19 +116,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	use gtk && gnome2_icon_savelist
+	use gtk && xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gtk && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gtk && xdg_pkg_postrm
 }