gentoo resync : 03.11.2019

5 files changed, 4 insertions, 141 deletions

diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 8172291ceca6..f7dd960cc0f5 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -10,8 +10,6 @@ AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa
 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-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8
-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-r6.ebuild 3188 BLAKE2B 95d91c206d0e1f301f2f2e8c51d2ddbfe1c36ca220cc9834778d3bacacdaf1dc613a0a1d75327b8a05a446285a39d2cb765084e4d87163d3c37f637328befb96 SHA512 48a75b4077260c07ff038435da0b07e5c588961bdb91ed868e2ef9fe77945c99ea7b2dfc97c2e180c58230ac3e6a20348beca022a37e2f83013646431cfa372a
-EBUILD zsnes-1.51-r7.ebuild 3240 BLAKE2B 44bc874aaa41381d63795b3c22e26155fd008d316d7b6c432f070a6b54868aac3c1f1cb34ab95b662be647b2f4c7ebb1f6413cbd5e1e313da859eb9e850acd4f SHA512 503b70a9f86c5e4c41b7b1bb312893ef14af46bc33ae443665af6c97f592a1a76bb493bb934c67da419939272a513a1545698143f36e1df1866c3e95fd3a9bdc
-MISC metadata.xml 484 BLAKE2B ad2da7cec97ca32be7ae42000312cdebd1c5dc5fce4ccc6f99fd16e69208350a5e714201e0bc258e8d4eb980357fe2517cc9b177e3ad74507b44d31ecdc8fe27 SHA512 02318871d54bfa7d9c4ba2a64f3ed7c83bf45b04a5c66dda5659d935b943a2415e6eaad124ac34e3c4235ba57f21c1189b03fec4f622c19eec1873531727a622
+EBUILD zsnes-1.51-r7.ebuild 3191 BLAKE2B 0e8ede6c07b0713cf10a37437c241aad7871ea9ab28316be957cfdc6839a0b7965f3f56c23e31ea9b824444a10fcab3486fd1c713ddc9622c382c6b0b86e0c83 SHA512 cc28feb77f700077f676b40ff595cb4cd43fc91b508f250fa746a4e48cb99e642fb2c68ba6774d4128564309d0f7148ff69764c442e1b8fce1ea9f5eaa97b706
+MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
deleted file mode 100644
index 5dcbf3ad9ebc..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/linux/sdllink.c.old
-+++ src/linux/sdllink.c
-@@ -773,11 +773,11 @@ BOOL InitInput()
- {
-   InitJoystickInput();
-   return TRUE;
- }
- 
--int startgame()
-+int __attribute__((force_align_arg_pointer)) startgame()
- {
-   static bool ranonce = false;
-   int status;
- 
-   if (!ranonce)
diff --git a/games-emulation/zsnes/metadata.xml b/games-emulation/zsnes/metadata.xml
index 8eb5529c51c4..d8c41ccdd533 100644
--- a/games-emulation/zsnes/metadata.xml
+++ b/games-emulation/zsnes/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="debug">Enable the builtin debugger</flag>
-    <flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">zsnes</remote-id>
diff --git a/games-emulation/zsnes/zsnes-1.51-r6.ebuild b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
deleted file mode 100644
index 288fa85dff10..000000000000
--- a/games-emulation/zsnes/zsnes-1.51-r6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ao custom-cflags +debug opengl pax_kernel png"
-
-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(-)] )
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	debug? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${PN}_${PV//./_}/src"
-
-src_prepare() {
-	default
-
-	# Fixing compilation without libpng installed
-	# Fix bug #186111
-	# Fix bug #214697
-	# Fix bug #170108
-	# Fix bug #260247
-	# Fix compability with libpng15 wrt #378735
-	# Fix buffer overwrite #257963
-	# Fix gcc47 compile #419635
-	# Fix stack alignment issue #503138
-	eapply \
-		"${FILESDIR}"/${P}-libpng.patch \
-		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libao-thread.patch \
-		"${FILESDIR}"/${P}-depbuild.patch \
-		"${FILESDIR}"/${P}-CC-quotes.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-buffer.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-stack-align.patch \
-		"${FILESDIR}"/${P}-cross-compile.patch \
-		"${FILESDIR}"/${P}-arch.patch
-
-	# The sdl detection logic uses AC_PROG_PATH instead of
-	# AC_PROG_TOOL, so force the var to get set the way we
-	# need for things to work correctly.
-	tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
-
-	sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
-
-	# Remove hardcoded CFLAGS and LDFLAGS
-	sed -i \
-		-e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
-		-e '/^LDFLAGS=.*local/d' \
-		-e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
-		-e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
-		-e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
-		configure.in || die
-	sed -i \
-		-e 's/configure.in/configure.ac/' \
-		Makefile.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	export BUILD_CXX=$(tc-getBUILD_CXX)
-	export NFLAGS=-O1
-	use amd64 && multilib_toolchain_setup x86
-	use custom-cflags || strip-flags
-
-	append-cppflags -U_FORTIFY_SOURCE	#257963
-
-	econf \
-		$(use_enable ao libao) \
-		$(use_enable debug debugger) \
-		$(use_enable png libpng) \
-		$(use_enable opengl) \
-		--disable-debug \
-		--disable-cpucheck
-}
-
-src_compile() {
-	emake makefile.dep
-	emake
-}
-
-src_install() {
-	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/*
-	HTML_DOCS="../docs/readme.htm/*" einstalldocs
-
-	make_desktop_entry zsnes ZSNES
-	newicon icons/48x48x32.png ${PN}.png
-}
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
index e7eec25d2035..6a452751e0e7 100644
--- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ao custom-cflags +debug opengl pax_kernel png"
+IUSE="ao custom-cflags +debug opengl png"
 
 RDEPEND="
 	media-libs/libsdl[sound,video,abi_x86_32(-)]
@@ -109,9 +109,7 @@ src_install() {
 	QA_TEXTRELS="usr/bin/zsnes"
 
 	dobin zsnes
-	if use pax_kernel; then
-		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
-	fi
+	pax-mark m "${ED}${GAMES_BINDIR}"/zsnes
 
 	newman linux/zsnes.1 zsnes.6