gentoo resync : 28.04.2021

3 files changed, 7 insertions, 131 deletions

diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 97b2c4fe5fa3..cd7b9e6742ed 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -12,6 +12,5 @@ AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d1
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
 AUX zsnes-1.51-stack-align-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8
 DIST zsnes-1.51-20071031.tar.bz2 1072340 BLAKE2B d67c92e382ca130d4138d21fbb2effc06539d1c7e3aabf0339c9b7e773521daf2d3cb0bcef75991e1a4453fcc86903d3dead48d90806489c8b4bf7677f8ebf3b SHA512 b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274
-EBUILD zsnes-1.51-r8.ebuild 3211 BLAKE2B e6d0c1a02743df48f3aacd130559ecc1d0b0d6002ce927bb73747149eb3a8da200365dbeb3b926f091ffc23514f73c14b13e3f9ad742d55983dacfbde451c9a7 SHA512 bef59012c2fb36aef65dcdebe2450a6b52f036fa13fe0c7ede478caafdf67084129d5a6c38fa68fad3f083e054a0af6cda13a3622a32211b59bb0c7b67621463
-EBUILD zsnes-1.51-r9.ebuild 3243 BLAKE2B 988d654c846b770dd0486bb0cfa6bab4444293e9e86fb3387ab9ce84c8dd0f8d4c5731dd3fd62f805f97da05008b777597865ac6e9960e2d6bc6d9001fd50ee6 SHA512 4711041845575e2e5aaaa146ab50731cc678957a783b16b2152a396bf6e29a06e21cca6024abc8e0560f1f4feea264264426aaf4a0d64ff881dd98910b85e502
+EBUILD zsnes-1.51-r9.ebuild 3247 BLAKE2B cd48b00ec6f809ad88ec73588207cac1a1c0a1d9610eb14acc1684c30ad581e7711b3aaf9891ac4ef2032fc42429cff5ab4339bf8205411b5294aed47d76f5b3 SHA512 94f7571ab21978188da7808c126f2f572136f3c9851a95d8ded6758dd8cc608b1635b431354d0d3f8bf7ddfb3f0eda7e8f9c6a0610682a4db361e6da77f33510
 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/zsnes-1.51-r8.ebuild b/games-emulation/zsnes/zsnes-1.51-r8.ebuild
deleted file mode 100644
index dd6efef7ca8d..000000000000
--- a/games-emulation/zsnes/zsnes-1.51-r8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ao custom-cflags +debug opengl 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"
-
-PATCHES=(
-	# Fixing compilation without libpng installed
-	"${FILESDIR}"/${P}-libpng.patch
-
-	# Fix bug #186111
-	# Fix bug #214697
-	# Fix bug #170108
-	# Fix bug #260247
-	"${FILESDIR}"/${P}-gcc43-20071031.patch
-	"${FILESDIR}"/${P}-libao-thread.patch
-	"${FILESDIR}"/${P}-depbuild.patch
-	"${FILESDIR}"/${P}-CC-quotes.patch
-
-	# Fix compability with libpng15 wrt #378735
-	"${FILESDIR}"/${P}-libpng15.patch
-
-	# Fix buffer overwrite #257963
-	"${FILESDIR}"/${P}-buffer.patch
-	# Fix gcc47 compile #419635
-	"${FILESDIR}"/${P}-gcc47.patch
-	# Fix stack alignment issue #503138
-	"${FILESDIR}"/${P}-stack-align-v2.patch
-
-	"${FILESDIR}"/${P}-cross-compile.patch
-	"${FILESDIR}"/${P}-arch.patch
-
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-
-	# 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() {
-	# Uses pic-unfriendly assembly code, bug #427104
-	QA_TEXTRELS="usr/bin/zsnes"
-
-	dobin zsnes
-	pax-mark m "${ED}${GAMES_BINDIR}"/zsnes
-
-	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-r9.ebuild b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
index a56e1e85d8de..a92368d1bf9f 100644
--- a/games-emulation/zsnes/zsnes-1.51-r9.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
 SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2"
+S="${WORKDIR}/${PN}_${PV//./_}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,13 +23,12 @@ RDEPEND="
 	opengl? ( virtual/opengl[abi_x86_32(-)] )
 	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/nasm
 	debug? ( virtual/pkgconfig )
 "
 
-S="${WORKDIR}/${PN}_${PV//./_}/src"
-
 PATCHES=(
 	# Fixing compilation without libpng installed
 	"${FILESDIR}"/${P}-libpng.patch
@@ -111,7 +112,7 @@ src_install() {
 	QA_TEXTRELS="usr/bin/zsnes"
 
 	dobin zsnes
-	pax-mark m "${ED}${GAMES_BINDIR}"/zsnes
+	pax-mark m "${ED}"/usr/bin/zsnes
 
 	newman linux/zsnes.1 zsnes.6