gentoo resync : 20.06.2021

13 files changed, 25 insertions, 205 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d22110588d10..5cbd1d949c37 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d03f635ae11c..a0b2631e78ab 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,4 @@
-DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20200705.ebuild 4421 BLAKE2B b0598e6e1ab9d723c8fb0c8cf55c3f7ea10025be78c8c184ab8bd50d42995a84d9fe918fe187c24f955139033db80fe8ac30bfdacbbe32d97b9b007e43a3092b SHA512 79b8dd2d3fb337c67e7d59784f97ae26ca6575fc192fdef7307c3061fe4e620d597c753e6692f84341738b437c3d1a53dcf733113f6708eae44c0595d4628200
 EBUILD dolphin-5.0_p20210506.ebuild 4776 BLAKE2B c57e99a792364b830e2e341cdac7810a0fd1d3df80e46b04767be72f710010543c67d780194552df739eedbd553bd1382a89114be9c2b51843bee19d6809614e SHA512 9e3d28ac322cbe22059e579f280113c3c673f2dba81b8a059f3f54154c958eaa7850e61deb1fc6debf344b7c03fe12e0a7abfc9453a8e3ac6793964fc06cfb36
 EBUILD dolphin-9999.ebuild 4790 BLAKE2B 7265a71932941ab75c1836237b380be893563c532e45e414d6880cb8d2e446ff53718a3b961b6eb1a3a04724a9e058f2cf432854d608e0ff6a79e8f01b87b638 SHA512 535fcef911387f2ee2f271a0b42ca36065030640728d745b96cdaae2c4744eda626c171576459d29abb6ee7d0ece31d64417029f39cd166ce7197945973bc5bc
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
deleted file mode 100644
index d06511da1c52..000000000000
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils l10n pax-utils
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
-	SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp"
-
-RDEPEND="
-	dev-libs/hidapi:0=
-	dev-libs/libfmt:0=
-	dev-libs/lzo:2=
-	dev-libs/pugixml:0=
-	media-libs/libpng:0=
-	media-libs/libsfml
-	media-libs/mesa[egl]
-	net-libs/enet:1.3
-	net-libs/mbedtls:0=
-	net-misc/curl:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	systemd? ( sys-apps/systemd:0= )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND="${RDEPEND}
-	media-libs/vulkan-loader"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove all the bundled libraries that support system-installed
-	# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
-	local KEEP_SOURCES=(
-		Bochs_disasm
-		FreeSurround
-
-		# vulkan's API is not backwards-compatible:
-		# new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-		# but dolphin still relies on it, bug #729832
-		Vulkan
-
-		cpp-optparse
-		# no support for for using system library
-		glslang
-		imgui
-		# FIXME: xxhash can't be found by cmake
-		xxhash
-		# no support for for using system library
-		minizip
-		# soundtouch uses shorts, not floats
-		soundtouch
-		cubeb
-		discord-rpc
-		# Their build set up solely relies on the build in gtest.
-		gtest
-		# gentoo's version requires exception support.
-		# dolphin disables exceptions and fails the build.
-		picojson
-		# No code to detect shared library.
-		zstd
-	)
-	local s
-	for s in "${KEEP_SOURCES[@]}"; do
-		mv -v "Externals/${s}" . || die
-	done
-	einfo "removing sources: $(echo Externals/*)"
-	rm -r Externals/* || die "Failed to delete Externals dir."
-	for s in "${KEEP_SOURCES[@]}"; do
-		mv -v "${s}" "Externals/" || die
-	done
-
-	remove_locale() {
-		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
-			return
-		else
-			rm "Languages/po/${1}.po" || die
-		fi
-	}
-
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Use ccache only when user did set FEATURES=ccache (or similar)
-		# not when ccache binary is present in system (automagic).
-		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_BLUEZ=$(usex bluetooth)
-		-DENABLE_EVDEV=$(usex evdev)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DENABLE_LLVM=OFF
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_SDL=OFF # not supported: #666558
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DUSE_SHARED_ENET=ON
-		-DUSE_UPNP=$(usex upnp)
-
-		# Undo cmake.eclass's defaults.
-		# All dolphin's libraries are private
-		# and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest
index 4f3b21a212c5..533cd250c883 100644
--- a/games-emulation/mupen64plus-audio-sdl/Manifest
+++ b/games-emulation/mupen64plus-audio-sdl/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-audio-sdl-src-2.5.9.tar.gz 28884 BLAKE2B a32aeff100e86f610e3b514718c6a4a786c6f88911f8782dcbc9b8a2d238c31984e5d119e31533363d8f848bf840ff7350ba41dea70e716d50cce14f2398c836 SHA512 624f7061b4909a5de071fbb8cf6432fd4b6ad390ea3f7dc7ae7a874dc922afee55352e53d48fba43d45a3282e9382e6b5774814c2a7d9724e134a01188596ea9
-EBUILD mupen64plus-audio-sdl-2.5.9.ebuild 1956 BLAKE2B fbacc7ce6ad7605e8fd08c9210e3f9d1d854d2ef2442126ba82ab4ef6916e523b7a926b4d4d9763d7c1374fd8bc161901d2fea49c54911762911885f97b59e92 SHA512 d5b38d5b1198a7ff2199f9f9a8537f56d4a66fd4e9548376c7d33a9cff9c316212b4d24946785e5b1899b112072d0321c92396234a654a64146cf20479e13e57
+EBUILD mupen64plus-audio-sdl-2.5.9.ebuild 1965 BLAKE2B 1ee2d8895b3e271a80897cd495742f01c519c1c3b0d88080b0cfeeb24bb95f51f8ef98517ffdd90a776d6e601dec1b3c23502f80bb8f98cada1173ee13c79e01 SHA512 83fe492a2c15c939c570cbfb12487278fe6bda86e02dc5016ab18f246cdb4a338ef96e4b992de01c4408ee5ba1f70d4a1135ea27fa8d8f14c66bfe6a967e6289
 MISC metadata.xml 345 BLAKE2B b5b03b304e1491135b6d30001afe6bd57e29873222bb41cbb4d9d47fd77be1581544139cf4800ad4f15afb4cbd0b9da167b2a6cb3242a2ce0e0689b7b88e6c1c SHA512 f6e02ffd8784ef686cea561d75bac4a5f231fa62e72a089380707663a738e3d10b1f134cce40cc8d60e36cf90ab9303971996b16797253f6509960873e787f2d
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.9.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.9.ebuild
index 0060f4baaaf8..f14cd365ad22 100644
--- a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,8 @@ RDEPEND=">=games-emulation/mupen64plus-core-${PV}:=
 		media-libs/speex:=
 		media-libs/speexdsp:=
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-emulation/mupen64plus-input-sdl/Manifest b/games-emulation/mupen64plus-input-sdl/Manifest
index f4f9df41ad8d..3db21a05d6f4 100644
--- a/games-emulation/mupen64plus-input-sdl/Manifest
+++ b/games-emulation/mupen64plus-input-sdl/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-input-sdl-src-2.5.9.tar.gz 56403 BLAKE2B 56d6c390783aa4a7f25f72a5295eb11f1ca2a69f2ffe4f0232d4a0c329e9c0eba0a2cbf46e66adfdf0462d2ec5337f7c6c4587ae29de346cd4cfe1d240f4d5fd SHA512 b613396ee05e82aaaf15e955f83b5cb4e854df1fdb34d5e1c96cf0fddf0af79aa5af2ceb19cc9cfeaef707c2ecafd25e0814e3d7715a20b740482d0ece273f2f
-EBUILD mupen64plus-input-sdl-2.5.9.ebuild 1672 BLAKE2B 867836b469fec24a8884902f0cdf97fdad027e34d529c03312c0b86f32b36fff9e1545c3ba5ad19d236a2a923300315a8ec3a146f2a773427b6b09a4dbcafba9 SHA512 4443ea7c6e39cafc3cb718d70009a492026881bcc014deb613f731f7498e96b9193f7a7204138339ba444912903b8c4e72cb4889806c55af2dd6545bb562905f
+EBUILD mupen64plus-input-sdl-2.5.9.ebuild 1681 BLAKE2B ca42426ec827c7241cbadd9f01df7b3941a81c8043bf69d253c1824bacc62af1105a883204ea0d399965568b2c45fcd7848ee41108fb1e971c06019f232e6377 SHA512 96a56d9d9c8fa848937d306ef8b1dd84ac46771f9e211237e0f98e25b4f74216adc6ea0ee64970eec02dd520005e7abf86345f84cf5a07afd74411ca71f160da
 MISC metadata.xml 345 BLAKE2B ad9e66275eecd48b36aea9d14bea0b3651adcafdccc82542761d9c8bf2636f2c56f31b7d4e451bbdf0108de016d923b998f59a4ed774a2becb1cde66bf95dd01 SHA512 52f335099ec233825167226c8c15e6b270820eb111c8b89bcb91a4606f7b1d1d79ed12f41ac5ee69d973137c618f038ff55e395097fb1f1517692083ca86c294
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.9.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.9.ebuild
index 3d9194e5df20..93595b4a86e4 100644
--- a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,8 +17,8 @@ IUSE=""
 
 RDEPEND=">=games-emulation/mupen64plus-core-${PV}:0=
 	media-libs/libsdl2:0=[joystick]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
index d4f6e149e353..f792b00c0799 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ b/games-emulation/mupen64plus-video-glide64mk2/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-video-glide64mk2-src-2.5.9.tar.gz 498350 BLAKE2B 8378cfc9fe624b3441e290d44d600e30a85393aca5a5a5867fb778a665ea0718ae15ba67ce5b62930cd4feffb7b1ddce88be6434de9791c82a979aa8f022ecd1 SHA512 cc4cce1a1f036cdda0748cf9eb758f21ba08dbe83a2844cf92d3e781102aaa3556934ca01dbae248a2d93c65209932b858988030beaa29395d79df70bf479bd4
-EBUILD mupen64plus-video-glide64mk2-2.5.9-r2.ebuild 2046 BLAKE2B f849cf10356fb7c5e5cec039dc2b2e70d192ece010731169e82f2c9e58cd68b70e79e31e05a40b7ae884b7123e8db1be7c1f73498c9093b1ab6c472d6b9577d5 SHA512 e7837b5333b651fd1ac94b5fa6023d6f427b533554c82c150ea7dd8acea9de1098693494a5579c44cab510291664aa3cadf9454ba870666a8b010cdea143b77a
+EBUILD mupen64plus-video-glide64mk2-2.5.9-r2.ebuild 2055 BLAKE2B 05ae86fd9ef45a9c968158e02aef9e48838a8ad59ba0b28b6fc3afbd4f002d035cb248630aa2e2f6d95664f4ca24676e2b2744c4837f03f1acc81ab32f7491e3 SHA512 105dcd6af7099315949bd96c7a83667b97827c08454c1378794c1276101a6a2210b29f37865a1d3dfae3f27b119ede938f8511d5bcc8144a2ff43879299b9b62
 MISC metadata.xml 463 BLAKE2B 6cbcef1504069cd790502a5af6d9d70f4eae6e581dc8afad5aaa1f39f2f1820dce233b4189a27814883c97b921bafc03bdab3909d34836459a7be1204a39c957 SHA512 7dd33f57017886cad81d7a745b9c1a49a3d1de8b66e241c97fbbd90884d1dd9c3e53a37565c7b0e07e48761fe5620fe101be7c57b38fe642d9e3bed93f609b45
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild
index 47affa118921..bf792c5697a8 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,8 @@ RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2-only=]
 	virtual/opengl:0=
 	gles2-only? ( media-libs/libsdl2:0[gles2] )
 	hires? ( dev-libs/boost:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
index 472bead79633..83274cac9c69 100644
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ b/games-emulation/mupen64plus-video-rice/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-video-rice-src-2.5.9.tar.gz 300964 BLAKE2B 652d6642b743703488465883de2fe1e83e873316f133322fce343a6c8f3be37f351a1a91bad56ee1b4568afcafee55c1cb3cd6679159e24c552df63174751376 SHA512 98be11217024408e7c61120e7eb3cf83d6c9f666a029c7d0e85790c885c99e795336a8fa4f5029e546eba8cc139c6a5e84dd6c2ae5c60784a90c27ce58cd0603
-EBUILD mupen64plus-video-rice-2.5.9-r2.ebuild 1858 BLAKE2B 66708b55ea0edcbfa8202dadd0f65b38465bb9b7459842f6f46e578b5261b8c502f5577d25344556d7b36b692acc8638a0e783a9d78c0d1c5b3a6919756e5762 SHA512 9ed85fb8fd262da2c4d1b5def7a248a3415ea657fbd4c422220ce69f46dfb8802a5c69dbb4714b7111974f054e12bda1743a2405e6835cbd77863de47e11b3c9
+EBUILD mupen64plus-video-rice-2.5.9-r2.ebuild 1867 BLAKE2B a70eebb487d1e15f88150cda0a779bb5390a94f43ebd6ccaa5ecbad044c0b037f900497a9bc2c879ff382b7d8eec7225cfd69dd1b072fe0b8e7003148c52a922 SHA512 63a0153abf3f07d93d4de07e2ecbeebaa6b4b11141ae608dd7e5ca0e6bd035f5d08950bacf9ade4e28511f6927760bd9cdaef108cbff420d2ac7783f0b50f055
 MISC metadata.xml 346 BLAKE2B e8e8b99a57f8ff54dcaedfca0b1c6ac65f8243c195374bc7b9591e435410f80767aea87a5526d1baecd5fa14889d8a90ba386cb5e732081aac6f771c3b76503f SHA512 a97be2ea2365ddd82e4693c3e4bbb3186ca2ef5a17ae8f3a6a6d07467ccaec1b27a22ca277fe6ceb1b773dff82a4a0dd0eb6f68690cc809cb51022c76ba924ca
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
index 14f93d58dc90..aae445ae0133 100644
--- a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,8 +20,8 @@ RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2-only=]
 	media-libs/libsdl2:0=[video]
 	virtual/opengl:0=
 	gles2-only? ( media-libs/libsdl2:0[gles2] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 151c542ccfb9..fbbfb3abde64 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -17,5 +17,5 @@ AUX zsnes-1.51-stack-align-v4.patch 1072 BLAKE2B bea28efa6092244ab5bc8cfd21b37d6
 DIST zsnes-1.51-20071031.tar.bz2 1072340 BLAKE2B d67c92e382ca130d4138d21fbb2effc06539d1c7e3aabf0339c9b7e773521daf2d3cb0bcef75991e1a4453fcc86903d3dead48d90806489c8b4bf7677f8ebf3b SHA512 b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274
 EBUILD zsnes-1.51-r10.ebuild 3323 BLAKE2B 5083bf26565f8b50e6335e82d5a5b8286ecff1728bb0f4b199ea433c3a05825c45a55f0d0c902d0cd885c4e42857ce3479b824f0815316fe157f553ac91a938a SHA512 d690600169200e3a5c9550b3568f6426cfca189f91474ae3dc1670b26360851b3e54f053ffa9474c4a3cda67dce6d30a4da2bcc04d3b97d634fbe96749fccf04
 EBUILD zsnes-1.51-r11.ebuild 3364 BLAKE2B a8cc8df1c570182888f6e9846657b35026ed82d17ec70afeb478509c0a2d54bc7fe6cf4509119b99db882638480ea5e14efab80419ec0fa70fc0aae6e7cfbfc5 SHA512 3862f1754a1079a568b7c2e9ef0d07af6832d500e11151fc89ed95eb407365ceb10ad1de31b153a5c655aad2b5b482f6739675d10f83b31e77c8ef1b43e3ebfe
-EBUILD zsnes-1.51-r9.ebuild 3247 BLAKE2B cd48b00ec6f809ad88ec73588207cac1a1c0a1d9610eb14acc1684c30ad581e7711b3aaf9891ac4ef2032fc42429cff5ab4339bf8205411b5294aed47d76f5b3 SHA512 94f7571ab21978188da7808c126f2f572136f3c9851a95d8ded6758dd8cc608b1635b431354d0d3f8bf7ddfb3f0eda7e8f9c6a0610682a4db361e6da77f33510
+EBUILD zsnes-1.51-r9.ebuild 3262 BLAKE2B ab505ab6cb222b1e42d853fba02f3d61e59a1e4c5a9cfa4ff8fc8ede5382c140111b579455236b6066f7077fd49f5d23568118dd128c165f15f54c886e703ea6 SHA512 aa0c7297d2972d4a78c94a59b9049323802ed060013ab7e44cebcead2bb7f546e3ae578f48095289ccad4b602cc2d677305e5fb71407bd425e7bcb567031dd20
 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/zsnes-1.51-r9.ebuild b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
index a92368d1bf9f..f97e76f12285 100644
--- a/games-emulation/zsnes/zsnes-1.51-r9.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/nasm
-	debug? ( virtual/pkgconfig )
+	virtual/pkgconfig
 "
 
 PATCHES=(
@@ -74,8 +74,8 @@ src_prepare() {
 		-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`:' \
+		-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/' \
@@ -85,13 +85,16 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
+
 	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
+	# bug #257963
+	append-cppflags -U_FORTIFY_SOURCE
 
 	econf \
 		$(use_enable ao libao) \