gentoo resync : 30.04.2018

10 files changed, 49 insertions, 43 deletions

diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index e88d7f3c3986..77fa9154ffbf 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,15 +1,15 @@
 AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
-AUX zsnes-1.51-arch.patch 2480 BLAKE2B a47ff14031ad5265a2f9b8eb6c5a8ec548e0b609d9b8c2c408094f6af8092709c76567a340ad71233818cca7b7f4223140964f53b4612db997e6bbbb1651e8b5 SHA512 669e6a68978dc0ad27268dece47ff0a2027586534ce88ef08eeb51464137026afcb51ef4c1222013a75bcd430dfa022919aad0dce932035479ebb72408971eb8
-AUX zsnes-1.51-archopt-july-23-update.patch 12668 BLAKE2B 0948a0c970a58e054aedb2fa82a0ce884c8047cb1bbb1832e19a1059a74cad2daf7a8260c2fa2eee1082ed04e0396bc1833bf4ca17c3d76eb720752740892318 SHA512 a02ba164e2f06915b7de92032b7757f90b545e2afd4275805ea3466ddb6f1f9f0973fbc838c690441a10bbc70fb9be12fc95e5fde19c0505f4264cae2721c944
-AUX zsnes-1.51-buffer.patch 3157 BLAKE2B 7fe07cf2c48cf16ba3cccd7b4cdcb2e2fb8b92688413ef1a47af1c9d7577cefa21d7e2aad0c9625b66a766560e12ead7f49314624cc740808f0f24d8add06471 SHA512 b9a18c288f59413a7bd7f25622774440124de8ab356bfa48ea29b0db39ec6380d7df715eaca031bcff0fcb4f94dfc6f3b1f0770bf29cc9324e096ee5a6876f47
-AUX zsnes-1.51-cross-compile.patch 942 BLAKE2B 42bae81cad71ebba6932663958dc69cfe129277bba971ba6179e9ea1bdf274c16188039ceebffefdbe5d608fe907bbd96773e3b3bdc2fa5432954d35aee2e74e SHA512 3059c466f32b74f3a6d583fb425c3f23f7a295800474baa49c4baee69fc047ff5f49107225f3a9917aed76697b50ff07e474a2fe666402d1bcd032e00959e7be
+AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
+AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
+AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
+AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
 AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
 AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
-AUX zsnes-1.51-gcc47.patch 316 BLAKE2B b13455647b3e527d36b30532c9b406e62869c4dc46ef2c36cd9a04969516b1c2110b3b30d690e78b6ee64dd4f5d3b7cb4e3dae8b74bef2eb9be5d78a749364a9 SHA512 3e9adecac963fd2769edcb979dde262ed54247f8d7f63b34d2f5f472e5d6eeb7bc3879de24210d312c5d1d4694abc32aeb9e853d3ab2ec7b7bad6794716e4da4
-AUX zsnes-1.51-libao-thread.patch 663 BLAKE2B dcd2a960d7dba58aa3dbe032010a7d97bd07f523d3a05a711b1d52cc6b497636d16f76f2ea443216ccdbaa140f5f691337c4d98b493ba53866c4bc79a1541078 SHA512 3b7dab3e8f7e55b5295ad728279aa116b0e1f63a9bfad398b55a2d7f5ba55c806311952311f3f3ac91803d903e91b724f6ceea53a15b5fe485a7b3c2e5dafbab
-AUX zsnes-1.51-libpng.patch 854 BLAKE2B 31a5e086fb108cd2a2c6004989974d053121b7fb4584fdf77e96e371d8ddc6a1dc949a47fca52d5a321b125915bc7e576eda8227f68b6c95adadae012c3a77e2 SHA512 210dcba006bdf6c18bb55e106e8bb2fcb9691deb89874fd4f9e034f2aaf9e8e96543b2177d31b94c121a811b80de6352b7b420fa8d0760055dc1d4df43bbaa68
+AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
+AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
+AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
-AUX zsnes-1.51-stack-align.patch 305 BLAKE2B 41d4a152d6824138caf2a0d62ed5dbdabacda546ad5a6043abfa7c93bd07945e9e02fb14e5278426f7c0f65aa430c6f4234505c1ec17a2b35fd82880f73929bd SHA512 632016ee78c62b02266f81ddde77c06ffaaffbbaa95d56a28b7830aec1befa2dd6a836a589ff6785a9971608a212868bf73a6a41bef2b348ab138cd03834f37b
+AUX zsnes-1.51-stack-align.patch 283 BLAKE2B 2ae8aaf28975f0f88ed77eafb3977706bd662215a7e286c32ce6a138993bda00c05012bc92bd106b6607d524990ccccf094e647c44a350babf3755c2dc6bf3a6 SHA512 543876c459d7448bb7707677de432dd0140320ab77752f1d9fbee4f58ea34158f1e223f46d5aa9e2858b902513a915517f27e86e51f2263f667a6baea608fb55
 DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r5.ebuild 3200 BLAKE2B 8399ddf8f386501b5f9322cb7aa47abbdaca29f46b6a25060f28e142eca7b2eaa7b3eb6643eeaba68a80bd1c358c8fbe8882592f340e6efd07803e9267e356cf SHA512 0493c4cbb3095d9231b668310e9bc64f09f8ce86f54ca3b05a0d5825f6405766bc2d7c1f91399d2406c46df864b44a073517c2da3751ecaa8414052957387285
+EBUILD zsnes-1.51-r6.ebuild 3198 BLAKE2B cf8d5505e5eef6c3d864cddc82dfd9af86ce32780c651536547994218e55658450ce8fb507126850ff16541fa342a6a99d13bf25d550d46072f07c338f8c14e0 SHA512 4a9a696fdfbc4f31c95fe5e81fd6a27b569771d8fe36b24a088594f0a36fbf13a6c30dc562e57a7e4842569b9b4a15a459f17bd24101f685160650232ccaddb6
 MISC metadata.xml 484 BLAKE2B ad2da7cec97ca32be7ae42000312cdebd1c5dc5fce4ccc6f99fd16e69208350a5e714201e0bc258e8d4eb980357fe2517cc9b177e3ad74507b44d31ecdc8fe27 SHA512 02318871d54bfa7d9c4ba2a64f3ed7c83bf45b04a5c66dda5659d935b943a2415e6eaad124ac34e3c4235ba57f21c1189b03fec4f622c19eec1873531727a622
diff --git a/games-emulation/zsnes/files/zsnes-1.51-arch.patch b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
index 2c8b690587be..b39549871b7f 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-arch.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in.orig
++++ b/configure.in
 @@ -233,72 +233,8 @@
    debug=no)
  AC_MSG_CHECKING(if you want gdb friendly executable)
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
index ba118878a2bd..b3e466036f22 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
@@ -1,5 +1,5 @@
---- tools/archopt.c.old
-+++ tools/archopt.c
+--- a/tools/archopt.c.old
++++ b/tools/archopt.c
 @@ -1,8 +1,30 @@
 +/*
 +Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
diff --git a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
index 5f3049b315ed..eb463682196d 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/initc.c.fortify
-+++ zsnes_1_51/src/initc.c
+--- src/initc.c.fortify
++++ src/initc.c
 @@ -1464,8 +1464,8 @@
    clearmem2();
  }
@@ -38,8 +38,8 @@
  
      if (yesoutofmemory) { asm_call(outofmemfix); }
      asm_call(GUIDoReset);
---- zsnes_1_51/src/zstate.c.fortify
-+++ zsnes_1_51/src/zstate.c
+--- src/zstate.c.fortify
++++ src/zstate.c
 @@ -99,15 +99,15 @@
    copy_func(buffer, &cycpbl, 4);
    copy_func(buffer, &cycpblt, 4);
@@ -68,8 +68,8 @@
      }
      */
    }
---- zsnes_1_51/src/gblvars.h.fortify
-+++ zsnes_1_51/src/gblvars.h
+--- src/gblvars.h.fortify
++++ src/gblvars.h
 @@ -33,9 +33,9 @@
  extern unsigned int SfxR0, *setaramdata, ramsize, *sram, nmiprevaddrh;
  extern unsigned int tempesi, tempedi, tempedx, tempebp;
diff --git a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch b/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
index 5823c6aa6ade..5c412e3e649b 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
@@ -1,5 +1,5 @@
---- a/src/acinclude.m4
-+++ b/src/acinclude.m4
+--- src/acinclude.m4
++++ src/acinclude.m4
 @@ -107,7 +107,7 @@ int main (int argc, char *argv[])
    with_zlib=yes,
    with_zlib=no,
@@ -18,8 +18,8 @@
    ZLIB_CFLAGS=""
    ZLIB_LIBS=""
    ZLIB_VERSION=""
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+--- src/Makefile.in
++++ src/Makefile.in
 @@ -103,8 +103,10 @@ main: makefile.dep $(Z_OBJS)
  	@ZC@ -o @ZSNESEXE@ $(Z_OBJS) @ZCFLAGS@ @LDFLAGS@
  	rm -f version.o
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
index e58102415212..b3250fee679b 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
@@ -3,8 +3,8 @@ Bug #419635
 https://bugs.gentoo.org/show_bug.cgi?id=419635
 Submitted by Nikos Chantziaras
 
---- a/src/tools/depbuild.cpp
-+++ b/src/tools/depbuild.cpp
+--- src/tools/depbuild.cpp
++++ src/tools/depbuild.cpp
 @@ -25,6 +25,7 @@
  #include <string>
  #include <cstdio>
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
index 880e08c698fe..1ae0a1467b3e 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
@@ -1,5 +1,5 @@
---- linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
-+++ linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
+--- a/linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
++++ b/linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
 @@ -177,11 +177,7 @@ 
    }
    else
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
index 4e49054c0972..fd974e799e30 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
@@ -1,5 +1,5 @@
---- acinclude.m4
-+++ acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -163,21 +163,21 @@
    libpng_prefix="")
  
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
index 32136643caec..5dcbf3ad9ebc 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/linux/sdllink.c.old
-+++ zsnes_1_51/src/linux/sdllink.c
+--- src/linux/sdllink.c.old
++++ src/linux/sdllink.c
 @@ -773,11 +773,11 @@ BOOL InitInput()
  {
    InitJoystickInput();
diff --git a/games-emulation/zsnes/zsnes-1.51-r5.ebuild b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
index 5787c4659bc4..bf1934226ab9 100644
--- a/games-emulation/zsnes/zsnes-1.51-r5.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools flag-o-matic toolchain-funcs multilib pax-utils games
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
@@ -17,16 +17,20 @@ RDEPEND="
 	media-libs/libsdl[sound,video,abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
 	ao? ( media-libs/libao[abi_x86_32(-)] )
-	debug? ( sys-libs/ncurses:0[abi_x86_32(-)] )
+	debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
 	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0[abi_x86_32(-)] )"
+	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
-	debug? ( virtual/pkgconfig )"
+	debug? ( virtual/pkgconfig )
+"
 
-S=${WORKDIR}/${PN}_${PV//./_}/src
+S="${WORKDIR}/${PN}_${PV//./_}/src"
 
 src_prepare() {
+	default
+
 	# Fixing compilation without libpng installed
 	# Fix bug #186111
 	# Fix bug #214697
@@ -36,7 +40,7 @@ src_prepare() {
 	# Fix buffer overwrite #257963
 	# Fix gcc47 compile #419635
 	# Fix stack alignment issue #503138
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-libpng.patch \
 		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
@@ -79,9 +83,9 @@ src_configure() {
 	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || strip-flags
 
-	append-flags -U_FORTIFY_SOURCE	#257963
+	append-cppflags -U_FORTIFY_SOURCE	#257963
 
-	egamesconf \
+	econf \
 		$(use_enable ao libao) \
 		$(use_enable debug debugger) \
 		$(use_enable png libpng) \
@@ -96,16 +100,18 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin zsnes
+	dobin zsnes
 	if use pax_kernel; then
 		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
 	fi
+
 	newman linux/zsnes.1 zsnes.6
+
 	dodoc \
 		../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
 		../docs/readme.txt/*
-	dohtml -r ../docs/readme.htm/*
+	HTML_DOCS="../docs/readme.htm/*" einstalldocs
+
 	make_desktop_entry zsnes ZSNES
 	newicon icons/48x48x32.png ${PN}.png
-	prepgamesdirs
 }