gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-emulation
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
50 files changed, 407 insertions, 714 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 8626f0fe395a..89607eed9a5c 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancescan/Manifest b/games-emulation/advancescan/Manifest
index 56ca1a753da2..cb18238da653 100644
--- a/games-emulation/advancescan/Manifest
+++ b/games-emulation/advancescan/Manifest
@@ -1,5 +1,5 @@
 AUX advancescan-1.16-sys-expat.patch 1543 BLAKE2B 72143e1dec74c828c4051a5b198f706caf3385e1a982eca142fd6f2f4c7a2f3797fb732fd1086b4f3c5cf93560f67077720c14945f52ed388ce981db559230c4 SHA512 a9dc80b75a8b9dbad3fe6c156c4de0cafee171d820845ea7ff2f042b7f73fd6cd10d710c60fb8bf4cfdea139f527008958b445d01838a8fdf6c96d3e76c530f4
 DIST advancescan-1.16-gcc6.patch 24440 BLAKE2B bd7b25859798cc3935fedc6d60ea822189301232426e2b071665aaf6af3a85f16d93c22373e8ad1b46da96ab577fceebe681e86021452aa20e24b0e0fd9b2a8a SHA512 e758ba7d900f1ca5fd6f32c3572fbf4c2a7cf77877f926511bd724ec5ec8ddb9697244f5a582eeb5275188ae2c8a14e8388cac93365ac348e9cc60835884a499
 DIST advancescan-1.16.tar.gz 316895 BLAKE2B 1ce2ec88a80cca8ff8d1fa09cba7b9c5583e42a3419bfd561bb184b53fe071c011b864ee813f0107667881112ca4adf01cd2b8e8148712927af1c82bc73f43c1 SHA512 6d359c160d54a0a1cd13db10f5fc9986fae4f1151e205024e40c21b0f933723351907156faec22a92561ad523151e3b7d4ff70a6eebbb6152bd3767063a31031
-EBUILD advancescan-1.16-r1.ebuild 823 BLAKE2B 34888280a3346d1fe381578a23ce22c1a05d63475351fa8cfcc2f8bdbfc04588ce80032cfbe51e6694e5a0df24fc8acb09211e329ab2d8f168f803742616743d SHA512 eeaa663ff348cdb6c6e63974af460398300b657af4a1430acdb15c57d03d6ad0e3c5e0859d6707c47219210f34fdc88693370c54f400a0f6d57fd1172cefe992
+EBUILD advancescan-1.16-r1.ebuild 833 BLAKE2B 6b0ce1ea3af395cacf473fc9aa0a07af7c0a221ec421c0dd1e4aa1fe0d47e0dee9f4ab6ca3a0bb833281546cec7d3c05af41b1f3ee2c357c45ea1f6e538de456 SHA512 3224725f4f1174fe6418b887f084e7ada20c983552e017bb2036cfde5ed91ef435c577a1d9c39fb51d79824c5f177b11baf38e8d86c35a6d8f5fe6f8f802588f
 MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
index e81b0ed11764..cebee4ad876a 100644
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine"
 HOMEPAGE="http://advancemame.sourceforge.net/scan-readme.html"
@@ -12,10 +13,11 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-libs/expat
-	sys-libs/zlib"
+DEPEND="
+	dev-libs/expat
+	sys-libs/zlib
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -24,7 +26,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	rm -rf expat
+	rm -rf expat || die
 	default
 	eautoreconf
 }
@@ -33,5 +35,7 @@ src_install() {
 	dobin advscan advdiff
 	dodoc AUTHORS HISTORY README doc/*.txt advscan.rc.linux
 	doman doc/{advscan,advdiff}.1
-	dohtml doc/*.html
+
+	docinto html
+	dodoc doc/*.html
 }
diff --git a/games-emulation/caps/Manifest b/games-emulation/caps/Manifest
index 9c5bddc0ab1a..aabf845d772a 100644
--- a/games-emulation/caps/Manifest
+++ b/games-emulation/caps/Manifest
@@ -2,5 +2,5 @@ DIST config_uae_ocs13_512c-512s.zip 1613 BLAKE2B 75262e48802d9dbfa95d9fc18aeb032
 DIST ipfdevlib_linux-20060612.tgz 60265 BLAKE2B 8ab649aef5be48287d88777e8ae94ea784922174f6a127ac5e8bfd906bb852caa9ffd624fbd51d062971c6b13ea0ae7089c0ad9356a10697cad425c348599b9a SHA512 6d01b35850af9f5f4a45f8ee7f9c9b7a02ffaf3830588c46cf718c5007316baac49c1c7c928f0fc78e9014e3f094cb6a2d6e842c1440a7b8e34e6c31899699d7
 DIST ipfdoc102a.zip 264258 BLAKE2B 07af5bd9e466d588472171694f778f6416d6cbad157782ab60ce0e7b764e6d5b9b1b3107d837edeee3253cba4332f182751894c0e897433124f6e6f1dd9ddf3d SHA512 f4b34349c65a5cffc6fad8370959ea0c2516087f46cbb43770b45cf14c573062e03abd77350cf4c8f690dc6a1d461dd0613a03ab70c1f8a72a3a43b9085730f0
 DIST ipflib_linux-amd64-20071115.tgz 24278 BLAKE2B 37cfa092dfaeb190de02233e021923c55d74a0445e850d35aeb2333a04a29c863769d770fd71a1110a112b719bcf5cecdc0d74f35546de51711b62da86077bbc SHA512 f306503a0aed7fd781bb6aea22a94fe72a5de952e3e26bb923d551ec5f165aa3fced4014df6a50f20b0f4526710b7e8643aa47a4de85f09bb2f3fe040d0b0f70
-EBUILD caps-20071115.ebuild 1548 BLAKE2B 410627ac26df710dcfb9279ada9f1a4d96f1d75988dc77dbd3ae441fea1a0aa84b4df9be3002fd44d327bd165a26e22d2112e47e0f05b8edde4bdfd71ece70ef SHA512 4b0cb66de587ed30daab8b203fbb3a086995786ceffb6d1e678b0308518b2ea4fd67b18ec5dfd9e9eb31b59dc106a44d70ffe1cbfe9a8d86fbcc04aecc48171f
+EBUILD caps-20071115.ebuild 1528 BLAKE2B c114276bf49c4d30e2e63aec8fe5801e658e1d88d1e6d1d49efec04bd3287c9c430af29f4da4798e21c966b5a2539d5f5072625bfb528a6625deb71bfad16621 SHA512 34b4235b94791716cf99c36bdb187761c1eccb4cb486cf040c5367be72f8ba3157185e4a39717aa79ad69c560959bb5a4057a5b18fb9700cad9883f226b1331c
 MISC metadata.xml 603 BLAKE2B 3a37c2c85d43ee38463f362f4ca6e85d0368ea684f3e63adb4438d08bd42b5562cb2a79067774f45ca773254c07bcc31b24e6a45d927ca54ab19c2dff6eb9fd5 SHA512 fedf1973e487ee47ad0ee6552e3867b2b9732084dae90cec32168bfea54dd8d6b25fedf3c7336205706a14b72a7c14cb4653a4b18293f7eb6661c3edb781e3b5
diff --git a/games-emulation/caps/caps-20071115.ebuild b/games-emulation/caps/caps-20071115.ebuild
index e466d2a9e18c..af23de72f397 100644
--- a/games-emulation/caps/caps-20071115.ebuild
+++ b/games-emulation/caps/caps-20071115.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils multilib
+
+inherit multilib
 
 DESCRIPTION="Support library for accessing and using C.A.P.S. images"
 HOMEPAGE="http://www.softpres.org/"
@@ -18,7 +19,6 @@ IUSE="doc"
 RESTRICT="strip"
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
 
 S=${WORKDIR}
 
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d9b1fbaf650e..b9c78d3c0644 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,4 +1,4 @@
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
-EBUILD dolphin-5.0_p20200705.ebuild 4427 BLAKE2B 1e5bb1dc1d994e38989f4414837da45ca0f3f1fd9e684ff017199ac0e1ffda7e3472a90c937b7a029736114f34cb0e8e58f3c77c8702b1c7547bbe5e8320a581 SHA512 f46e6bc95f0cb5c68fa4bf202acac60bebe1a9fad8d399161e156da1a365b70c2eb974516f3275f26a4e1f8506344874f257230248a3c7eaf497f74ce5245f09
-EBUILD dolphin-9999.ebuild 4677 BLAKE2B fe9d9f67ee3be9bd025f56904bbb37dbe53585401e2382723b8c009c642da1bc0877f3f3ecf0717826176c4b13e9e1722e4152727aff25bcd5c91fcb62ecbf09 SHA512 3d3ffdfd0dc77abedfbbb53034ca38072b2d7ddc95e0d8cdf04625ab0c685789e0a245f044b94447ee7910801068b3241a7f81d47e960087ebad0cb3b131dd5b
+EBUILD dolphin-5.0_p20200705.ebuild 4421 BLAKE2B b0598e6e1ab9d723c8fb0c8cf55c3f7ea10025be78c8c184ab8bd50d42995a84d9fe918fe187c24f955139033db80fe8ac30bfdacbbe32d97b9b007e43a3092b SHA512 79b8dd2d3fb337c67e7d59784f97ae26ca6575fc192fdef7307c3061fe4e620d597c753e6692f84341738b437c3d1a53dcf733113f6708eae44c0595d4628200
+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
index e933904d1e56..d06511da1c52 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.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
@@ -148,7 +148,7 @@ src_configure() {
 		-DUSE_SHARED_ENET=ON
 		-DUSE_UPNP=$(usex upnp)
 
-		# Undo cmake-utils.eclass's defaults.
+		# Undo cmake.eclass's defaults.
 		# All dolphin's libraries are private
 		# and rely on circular dependency resolution.
 		-DBUILD_SHARED_LIBS=OFF
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 14b329e33b85..b8b8e1e3b4e3 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.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
@@ -11,6 +11,7 @@ inherit cmake desktop xdg-utils l10n pax-utils
 if [[ ${PV} == *9999 ]]
 then
 	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	EGIT_SUBMODULES=()
 	inherit git-r3
 else
 	inherit vcs-snapshot
@@ -69,7 +70,7 @@ BDEPEND="
 # vulkan-loader required for vulkan backend which can be selected
 # at runtime.
 RDEPEND="${RDEPEND}
-	media-libs/vulkan-loader"
+	vulkan? ( media-libs/vulkan-loader )"
 
 src_prepare() {
 	cmake_src_prepare
@@ -131,8 +132,11 @@ src_prepare() {
 	l10n_find_plocales_changes "Languages/po/" "" '.po'
 	l10n_for_each_disabled_locale_do remove_locale
 
-	 # About 50% compile-time speedup
+	# About 50% compile-time speedup
 	use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
+
+	# Remove dirty suffix: needed for netplay
+	sed -i -e 's/--dirty/&=""/' CMakeLists.txt
 }
 
 src_configure() {
@@ -156,7 +160,7 @@ src_configure() {
 		-DUSE_SHARED_ENET=ON
 		-DUSE_UPNP=$(usex upnp)
 
-		# Undo cmake-utils.eclass's defaults.
+		# Undo cmake.eclass's defaults.
 		# All dolphin's libraries are private
 		# and rely on circular dependency resolution.
 		-DBUILD_SHARED_LIBS=OFF
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index a3cae580dec8..34df0d6e185b 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -5,7 +5,7 @@ DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
 DIST dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff 97353 BLAKE2B bb95f9916d4dc8813d1fb4b61c63e50aba5d1862e5554c4af0fc2e75c105b477a6e6ef8b8941e9570860a2fe41570eca94ef36e1d594a2fb9a922b132b210e76 SHA512 b4cf2e5a335b948de94567806950c9512d81adc7687a184b6da5aae082c437af51c61950b1abd0d0c00d83ce37b5ee365ee6bb9e981854fce8bfbb0b1e93be68
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B bc38f48859f1d96aa2244924dbcf62f16ee45cd078f99161e381be6f0edb2760295e20f700d296f9408c5af109d5df86a1fda9a8458f4b6f799eb14f3db6edfd SHA512 e8123c54e12c80a67ad742c2e0c78ba4db54f992ae6e6922e265642de19e4b5ceedefc83c689e4ea7f96ca63ccd30d700b70e3eded8a575d755381d52066d318
-EBUILD dosbox-0.75_pre4302.ebuild 2275 BLAKE2B a2c75aa6878402f3fb8b554c8009ca1b9d194e160870eebf0736fba8ae8fb1995d65d9f490b1c2a132f8476bff4dc664b0a2626894bd7627adf12b183698184b SHA512 e0b3233630ebcfe2cc4f72607eb45d5f164ee09db41a5a44ceee701d5fb764cf1b5b154315f51c12abf7409e41df8ecc102707ef1b2642d072840a5b13ed71d3
-EBUILD dosbox-9999.ebuild 2205 BLAKE2B dc194b454d65fae6e925cdea982ac41ce87ebd30c3a7469c0757807595dc62e33cf48dc333e79ed0870c3477b30c233afc4393707775293f0601da1cf75812e6 SHA512 70d33b49e97239809db36040fc26a51d14eec10e16662d8e143791d2c1afdd5526f79c9cd35b3aa83259dceeb3fb4d1f1aea456be8c25cac09adcbbab3022f66
+EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B 05abcda688e1a6bd53c1494e7a9496a40f2d73acbac29e8e5c92c91d245f22f3926a7be774c053851372e3f4b5c7bbeac1ebed17dbfa0524889c77c19f25da81 SHA512 c9fcbf5fb32bfeaf7d72611b2e0764f6995049afb0e79e3d4db1a8f28d36ceb34e9918618219115a960e96b6c76bcc3276a99951d2d6b29804dec05fd9fdd25f
+EBUILD dosbox-0.75_pre4302.ebuild 2288 BLAKE2B c8308ab88550535af2055ee448f08140707cd78af02fd644d7b2b31a6061fd04ab220bca579fdc645da6e9960149022501e87733c3469ed57bf00dfb1ed664d4 SHA512 bc41da3fbbd55b4784f248fb3a7f6ec4802cd41f66d448bd0cc59d3944648383026b8e272966b5fc2f02f54c0801f33d59ab6c9ca301a982c040a9a50e0d96ad
+EBUILD dosbox-9999.ebuild 2206 BLAKE2B 066c39c10f7526ab0b54e858fbc5e82a5148a902a4a8e5a7b39289efa370bf55af91ec132a8da7a580d2834e9f9d0f7b64e416703c52d3f3a0c28dca7a6e6616 SHA512 fa2833a8de8d791b27bcecfd99b06ede3caef2caa86bb97aed541b43624c85693709a6656826022e40a5a3923c2b7d3364ef3e86de44b0a59d593f1351a67b7b
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 7ed3281b1644..efeca818c009 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -1,31 +1,33 @@
-# 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
+inherit autotools desktop
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
@@ -40,11 +42,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.74-ncurses.patch
 )
diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index fd00727100c9..8ae6d980d50b 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -1,27 +1,27 @@
-# 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
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
@@ -29,6 +29,8 @@ SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
@@ -44,11 +46,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.74-ncurses.patch
 	"${FILESDIR}"/${PN}-0.75-detect-AR.patch
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 205ff225911c..cb63c341cf2c 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -5,23 +5,23 @@ EAPI=7
 
 inherit autotools desktop flag-o-matic
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 GLIDE_PATCH=6a01f554fad979cf34d3ff07c9579192c88086c3
@@ -29,9 +29,10 @@ SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
@@ -44,11 +45,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.75-ncurses.patch
 )
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 71b91f0cbaee..177a4b5aa1b7 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -2,5 +2,5 @@ DIST emutos-192k-0.9.12.zip 1655923 BLAKE2B 2bc874c761d77d6b80e0ebf35e487951db86
 DIST emutos-256k-0.9.12.zip 2038241 BLAKE2B e287357877efe2346bd1936768f6c56e655e4b7d249545f4e3827e02c295817e6586477b68058e95690562c65a9085fa9e712da540727d93e12789f5bde325aa SHA512 18f43d2fc215e686fabafe0413b88d3593dc7ef931191541690527fbe7fcb4ff08ee946f75ceadf25d09c05fb69ae7d71230cc5b36ec42c7774fc5770b8a276d
 DIST emutos-512k-0.9.12.zip 301555 BLAKE2B 6341b4ac4fad707d81ab621e2952b2a92b139947b0ebc522983163fa86f308c595482f8b6caa23472bb022f1380f0a5963532b119c53676fe65b5115cde6d413 SHA512 0c68c76dede7d9a36c408f3a1bced2b710b1ad87fee5ba204e1b8c19a48ef1c51942eb766355c20f5cf95cc885423fd2750dc212c5dffe25b1d28620cc117854
 DIST emutos-aranym-0.9.12.zip 273147 BLAKE2B 863da12081f32ee665180d4536666a6558b475c6413e4f95aacd333f3a7d9a42820a04376b1b0484a975177abc3d41b2765c9147231829724e721dd477ebd328 SHA512 351104f097e5812be21fb30c41c829e62f127da39cc190ca60d26d20d94fedfb21493265b6b7113b9babb262dc30e0b87f1e235c90339f221b559578eacc5c44
-EBUILD emutos-0.9.12.ebuild 800 BLAKE2B a68f35c0129d8d578e37e9d06f466c72fd2d481b450836971dac42af502286abf19d441456288fdf3490b86e6d0a7fb5bed390c7353fe74f6c301b9a2e131265 SHA512 e88203235973df57707b72a345e3a3ba35ecb640704d0801d29d0470527bd59a4e1bff90319451e790904b7f5687180116d8c51d13bc4afbad8d812ff87cc64c
+EBUILD emutos-0.9.12.ebuild 802 BLAKE2B 18feff9d978793736da6fe6e85b0dbd985540e7d68d0a5b41d2aa8224b8bc4b1cb4556900f6bbe14568f3ee62f54c6358babfbd72be0f3d1267b601fc2b57a5b SHA512 b2bdfb086a0d78fcec282ead3a7ac0033cddc24331e2b129979c2ec8f5ed2398e416e30e0fb2f1dd3c14f206429a928196e623c27ecd6fa8f5ae4262b740e6b4
 MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.12.ebuild b/games-emulation/emutos/emutos-0.9.12.ebuild
index 538e577b77ad..1a35e794e98f 100644
--- a/games-emulation/emutos/emutos-0.9.12.ebuild
+++ b/games-emulation/emutos/emutos-0.9.12.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
@@ -13,12 +13,13 @@ VERSIONS=(
 DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
 HOMEPAGE="http://emutos.sourceforge.net"
 SRC_URI=$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip\n" "${VERSIONS[@]}")
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index bc3f10bc7431..2a060d525b5e 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -1,4 +1,4 @@
-AUX fbzx-3.0.0-gentoo.patch 6372 BLAKE2B 0e218a83a4eee9f7fbb632f74eb64358149715835f566c4256cecfa5857c615d732073a1346b0e8f4998fb5c560d7c2d39a083e5c1ae99cf4c889b6de42b8cde SHA512 4de9830dcfe015833939c1795f016d37afa0d364b94de2cc64b941f8d4df2acbe7220be951fa403bab6eba0db4882a8c15c376eac108fe6331e67708515b876e
+AUX fbzx-3.0.0-gentoo.patch 6059 BLAKE2B 60850bd4bf8ca51ba2dcb251f0216107eb7887e0e2346b460e0968fc4c87ae83ef0de0333ecde9e485a5949569e87254cfa81a96b6a9521234cc8a5811dc534f SHA512 5a4b48cbc75f14bbc24b693792510f8837670a1ee6de40c7be15c2ffc7ac05be20c1170b514539907517527eef0be496efaa7b407e3f13dc120dd7894a3cd7fe
 DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083
-EBUILD fbzx-3.0.0-r1.ebuild 852 BLAKE2B c2c32bf293dc5803cbbc21b56cc5baee95bfc28f6e258482c3b9499f94cbe2f909329869e86bd1b49a4a5d6fb24054cb999d4bfc1dbbe45dc60ab9a0065e57c0 SHA512 775bfb04e9ba7c1bf47aa69260d4413caa5270202ca12434dd15f870570657d584eb2dee11cb4abeba57765dde96b4df2352a60504429203fa0ff7f44532cebf
+EBUILD fbzx-3.0.0-r1.ebuild 888 BLAKE2B 476e145cba1d21d8bd4aa1a533cc7548e6666ad73127dbbfeda9f4bbdb7d8d5e9bc7561705907f98c9f1fab65542c3312e28f9fef09d5c545ad7ab4b4e1a5cf9 SHA512 dee4af74a2bf67953cd1aed76b4e209683660102f807f3b93efe681dab8fb557b8c12877a259c9d88096774e2ae5a2209de1ee13ff6ec99ed3f37d767cf0a391
 MISC metadata.xml 333 BLAKE2B b7e32a98bd1f4530fd7ea419607e8ff57998633131c3cde906f698e91810af4b6750e5c70b3a17e1ebaa532022952bd8d0bd915a41fb755d30ca1759b3c0c189 SHA512 d865ef840f0a446091249c24b36dc7d5cca2aaeac727d0f1d45bf8699e7d55d396cca469b02e84e26cc056f506051bb81557c0cf33d74a5a01a8d114ed3f3554
diff --git a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
index 8fcb34dbfc9c..ffe2b98753cb 100644
--- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit desktop
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Full Screen Sinclair Spectrum emulator"
 HOMEPAGE="https://github.com/rastersoft/fbzx"
@@ -11,7 +12,6 @@ SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl[video]
@@ -22,16 +22,24 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
-	default
 	sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die
-	eapply "${FILESDIR}"/${P}-gentoo.patch
+
+	tc-export PKG_CONFIG
+
+	default
 }
 
 src_install() {
 	dobin src/fbzx
-	insinto "/usr/share/${PN}"
+
+	insinto /usr/share/${PN}
 	doins -r data/{keymap.bmp,spectrum-roms}
+
 	dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
 	doicon data/fbzx.svg
 	make_desktop_entry fbzx FBZX
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
index 0e1f02337146..f9751d7486dd 100644
--- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
+++ b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
---- fbzx-3.0.0.orig/src/Makefile	2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/Makefile	2016-04-01 13:15:27.230190807 -0400
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -1,78 +1,74 @@
 -CC=g++ -c -O2
 -CPP=g++ -c -O2
@@ -8,7 +7,7 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
 -
  CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
 -CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-+CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
++CXXFLAGS += `${PKG_CONFIG} --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
  LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
  
  
@@ -104,9 +103,8 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
 -	$(CPP) $(CPPFLAGS) -o tape.o tape.cpp
 +	$(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
  
-diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp
---- fbzx-3.0.0.orig/src/menus.cpp	2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/menus.cpp	2016-04-01 13:15:33.213974823 -0400
+--- a/src/menus.cpp
++++ b/src/menus.cpp
 @@ -1691,7 +1691,7 @@
  
  void keyboard_menu() {
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 1507c0baaeb1..7dc8c76ca605 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,6 +1,4 @@
-AUX higan-106_p1-QA.patch 3708 BLAKE2B 25f3707c4336e423017eb879e9dfc02fee9660ee8c5e8390813906614eab8fd4306eabbe15e4330f7f00efed0231a335ec83a3682eb338bdc3f772546fd5d9b7 SHA512 ba5bf66a242baf7b2385ffd7a26c5a180589f917b5a636fa99dd488b4a733c09e6e3eb3ccc013b63817661c498149d943a53d3e536674251ae94f352516a4f44
-AUX higan-106_p1-header-locations.patch 598 BLAKE2B d7935edf4f241802ffc5200f8b4944fe1dff4596941993c7539e290f1640eb5e552a263d1a8d0c6db6b2d909b35bc34350aa84a4ba7ea9f8fb06d8466c59a673 SHA512 756893707d9048bf9f34818733ab812d7a81da329646c77536fc6feef74e97b6e3804dfdfd062e5899bba30c70343afdd3b62a5dfd1b79488b7fdec7bde57a91
-AUX higan-106_p1-wrapper 166 BLAKE2B 87659c19e485a4eca90178a9c2faf96214af7a13fb16c04a2175f3157dd4b522e6414fed9216a9acb293111f2f994837a9a496075ab0bebd2c78e3a5710330a4 SHA512 db297cfc9b6f5ff1553b52587a9988af46ad7d2aadbaa17743676250679e2bada68d97f85e934ce8c1eb7f57ac3f18c43a33eaca809a1f10f5a4f22c8cbe137a
-DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
-EBUILD higan-106_p1-r1.ebuild 3137 BLAKE2B dbc5a4bb1e4ed2bc60b183d0b29a9c44a468d5d88c1496a7f4996f6e4bd36f21b1049697c810f30449eb24fc16c8370e4e1e8f1873b1fc23adea42aa31fb2a3c SHA512 bba6935d5de6a707c42737c9cb4acd3af243cbffef5552ae0fb9ace207e2a937067680467ce1556e1ee7ef19a56390ee6f211bd32665594bf9a48e8771421668
-MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
+AUX higan-116_pre20210404-makefile.patch 2657 BLAKE2B d74b58ffedff5d4c1345bbbd0023dbabc162ff305fd39bf77a33b47dc6002f8fe3ad1d729bd5bcaa67dc6a57a4e6dd5cdce298bb6121396b0d779aa98845717b SHA512 c876acb714658cb1ba6fca9c359b9f030f5e15035bcf35697276ba5a3b68dd6098784b5e2eacc5bf7e082922d748eb526784c88139b24a099340531b34e3f152
+DIST higan-116_pre20210404.tar.gz 9130899 BLAKE2B bb9830901d7014f9d442f3a3bd9bd82ad791d2ba62a3264cfc187e5d7498a5ec6eae1fff6509f5206d9a21294e2a3ef710fbed5fac3626ecc88c4156bd50f289 SHA512 8ee40d8b9867fe767d5321dc4df3e73039fa39b7ecad2eddb58c3114bcf42b1b2074396ae5c4783ca060057aeb4bca7110101cc44d9608fe7c4d5f561b3f40a5
+EBUILD higan-116_pre20210404.ebuild 2329 BLAKE2B 860b44b05c893addafb88ad3622067736924936aee4d9abb583f7a06014540e33a589004c1d5aa6ce708b0d39e1a373e87307b346650d5df41e69f6752c0f7d0 SHA512 6a76a5124d4fe6703abdd859c5a53c5cdf7ea16aca56e0aadc0874ec5c528598c7e2a8de7635c8a38a708aea518de0262001cc388b3c44fbb7cde261650288b4
+MISC metadata.xml 487 BLAKE2B c138223ee8452d6db2ca0aff44ce7065ee4268961c4cc287b69e46cd2d65b4928f2dd5a0d8bc78e2a1c55a8d8fb77fbd62e5703b814417fea71d9e35e5681a56 SHA512 0f2ef2ffa6aed301e12f97190e66636bcdba9812488ba7ebb7200ee8298b004053e356a84b3415cd78931cc64726a49e9823b9b73aefda2d9b707b9bf9f80e1d
diff --git a/games-emulation/higan/files/higan-106_p1-QA.patch b/games-emulation/higan/files/higan-106_p1-QA.patch
deleted file mode 100644
index 140fdf9a48e7..000000000000
--- a/games-emulation/higan/files/higan-106_p1-QA.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 3ca37e53f22bfbb4ef436829904dc75b1f4940ec Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:16:53 +0100
-Subject: [PATCH] Quickport higan-099-QA.patch to v106r1
-
----
- higan/GNUmakefile               |  5 ++---
- higan/target-tomoko/GNUmakefile |  6 +++---
- icarus/GNUmakefile              |  4 ++--
- nall/GNUmakefile                | 19 -------------------
- 4 files changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/higan/GNUmakefile b/higan/GNUmakefile
-index 5eac824..2616ed1 100644
---- a/higan/GNUmakefile
-+++ b/higan/GNUmakefile
-@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux bsd),)
-   flags += -fopenmp
-   link += -fopenmp
-   ifeq ($(binary),application)
--    flags += -march=native
-     link += -Wl,-export-dynamic
-     link += -lX11 -lXext
-   else ifeq ($(binary),library)
-@@ -40,9 +39,9 @@ endif
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
-+      $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
--        $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
-+        $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
-       ) \
-     ) \
-   )
-diff --git a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile
-index bfdcbe2..bdb6d44 100644
---- a/higan/target-tomoko/GNUmakefile
-+++ b/higan/target-tomoko/GNUmakefile
-@@ -48,10 +48,10 @@ objects := $(ui_objects) $(objects)
- objects := $(patsubst %,obj/%.o,$(objects))
- 
- obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
--	$(compiler) $(rubyflags) -c $< -o $@
-+	$(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
--	$(compiler) $(hiroflags) -c $< -o $@
-+	$(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/)
- obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/)
-@@ -67,7 +67,7 @@ obj/ui-resource.o:
- 
- # targets
- build: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link))
-+	$(strip $(compiler) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- ifeq ($(platform),macos)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/icarus/GNUmakefile b/icarus/GNUmakefile
-index d01465e..999c004 100644
---- a/icarus/GNUmakefile
-+++ b/icarus/GNUmakefile
-@@ -3,7 +3,7 @@ include ../nall/GNUmakefile
- include ../hiro/GNUmakefile
- 
- name := icarus
--flags += -I..
-+flags += -I.. $(CXXFLAGS)
- link +=
- 
- ifeq ($(platform),windows)
-@@ -15,7 +15,7 @@ objects += obj/icarus.o
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
- 
- all: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
-+	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
- ifeq ($(platform),macos)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f9865de..f864cde 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -59,25 +59,6 @@ ifeq ($(compiler),)
-   endif
- endif
- 
--# build settings
--ifeq ($(build),optimize)
--  flags += -O3
--else ifeq ($(build),release)
--  flags += -O2
--else ifeq ($(build),stable)
--  flags += -O1
--else ifeq ($(build),debug)
--  flags += -g
--else ifeq ($(build),profile)
--  flags += -pg
--  link += -pg
--else ifeq ($(build),instrument)
--  flags += -O3 -fprofile-generate
--  link += -lgcov
--else ifeq ($(build),optimize)
--  flags += -O3 -fprofile-use
--endif
--
- # clang settings
- ifeq ($(findstring clang++,$(compiler)),clang++)
-   flags += -fno-strict-aliasing -fwrapv
--- 
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-header-locations.patch b/games-emulation/higan/files/higan-106_p1-header-locations.patch
deleted file mode 100644
index 7f72a1311491..000000000000
--- a/games-emulation/higan/files/higan-106_p1-header-locations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 420b10135f678367560621416799c48af0ef3764 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:44:22 +0100
-Subject: [PATCH] Patch header locations for Gentoo
-
----
- nall/GNUmakefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f864cde..41fdc08 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -82,6 +82,7 @@ endif
- 
- # linux settings
- ifeq ($(platform),linux)
-+  flags += -I/usr/include/cairo/ -I/usr/include/gtk-2.0/ -I/usr/include/gtksourceview-2.0/
-   link += -ldl
- endif
- 
--- 
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-wrapper b/games-emulation/higan/files/higan-106_p1-wrapper
deleted file mode 100644
index 1de577fd1923..000000000000
--- a/games-emulation/higan/files/higan-106_p1-wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-[ -e "${HOME}"/.local/share/higan ] || mkdir "${HOME}"/.local/share/higan
-cp -ru /usr/share/higan/* "${HOME}"/.local/share/higan/
-exec ${0}.bin "$@"
diff --git a/games-emulation/higan/files/higan-116_pre20210404-makefile.patch b/games-emulation/higan/files/higan-116_pre20210404-makefile.patch
new file mode 100644
index 000000000000..21f3f35ae3e5
--- /dev/null
+++ b/games-emulation/higan/files/higan-116_pre20210404-makefile.patch
@@ -0,0 +1,85 @@
+--- a/higan-ui/GNUmakefile
++++ b/higan-ui/GNUmakefile
+@@ -54,7 +54,7 @@
+ 
+ all: $(all.objects)
+ 	$(info Linking $(output.path)/$(name) ...)
+-	+@$(compiler) -o $(output.path)/$(name) $(all.objects) $(all.options)
++	$(compiler) $(LDFLAGS) -o $(output.path)/$(name) $(all.objects) $(all.options)
+ ifeq ($(platform),macos)
+ 	rm -rf $(output.path)/$(name).app
+ 	mkdir -p $(output.path)/$(name).app/Contents/MacOS/
+--- a/hiro/GNUmakefile
++++ b/hiro/GNUmakefile
+@@ -70,7 +70,7 @@
+ 	$(if $(filter qt%,$(hiro)),$(info Compiling $(hiro.path)/qt/qt.moc ...))
+ 	$(if $(filter qt%,$(hiro)),@$(moc) -i -o $(hiro.path)/qt/qt.moc $(hiro.path)/qt/qt.hpp)
+ 	$(info Compiling $(subst ../,,$<) ...)
+-	@$(compiler) $(hiro.flags) $(flags) $(flags.deps) -c $< -o $@
++	$(compiler) $(hiro.flags) $(flags) $(flags.deps) -c $< -o $@
+ 
+ $(object.path)/hiro-resource.o: $(hiro.resource)
+ 	$(info Compiling $(subst ../,,$<) ...)
+--- a/icarus/GNUmakefile
++++ b/icarus/GNUmakefile
+@@ -19,7 +19,7 @@
+ 
+ all: $(hiro.objects) $(objects)
+ 	$(info Linking $(output.path)/$(name) ...)
+-	+@$(compiler) -o $(output.path)/$(name) $(hiro.objects) $(objects) $(hiro.options) $(options)
++	$(compiler) $(LDFLAGS) -o $(output.path)/$(name) $(hiro.objects) $(objects) $(hiro.options) $(options)
+ ifeq ($(platform),macos)
+ 	rm -rf $(output.path)/$(name).app
+ 	mkdir -p $(output.path)/$(name).app/Contents/MacOS/
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -77,17 +77,7 @@
+ endif
+ 
+ # build optimization levels
+-ifeq ($(build),debug)
+-  flags += -Og -g -DBUILD_DEBUG
+-else ifeq ($(build),stable)
+-  flags += -O1 -DBUILD_STABLE
+-else ifeq ($(build),size)
+-  flags += -Os -DBUILD_SIZE
+-else ifeq ($(build),release)
+-  flags += -O2 -DBUILD_RELEASE
+-else ifeq ($(build),performance)
+-  flags += -O3 -DBUILD_PERFORMANCE
+-endif
++flags += $(CPPFLAGS) $(CXXFLAGS) -DBUILD_RELEASE
+ 
+ # link-time optimization
+ ifeq ($(lto),true)
+@@ -167,7 +157,7 @@
+ 
+ %.o: $<
+ 	$(info Compiling $(subst ../,,$<) ...)
+-	@$(call compile)
++	$(call compile)
+ 
+ # function compile([arguments])
+ compile = \
+--- a/ruby/GNUmakefile
++++ b/ruby/GNUmakefile
+@@ -74,7 +74,7 @@
+ 
+ $(object.path)/ruby.o: $(ruby.path)/ruby.cpp $(call rwildcard,$(ruby.path))
+ 	$(info Compiling $(subst ../,,$<) ...)
+-	@$(compiler) $(ruby.flags) $(flags) $(flags.deps) -c $< -o $@
++	$(compiler) $(ruby.flags) $(flags) $(flags.deps) -c $< -o $@
+ 
+ ruby.verbose:
+ 	$(info ruby Drivers:)
+--- a/sourcery/GNUmakefile
++++ b/sourcery/GNUmakefile
+@@ -11,7 +11,7 @@
+ 
+ all: $(objects)
+ 	$(info Linking out/$(name) ...)
+-	+@$(compiler) -o out/$(name) $(objects) $(options)
++	$(compiler) $(LDFLAGS) -o out/$(name) $(objects) $(options)
+ 
+ verbose: nall.verbose all;
+ 
diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
deleted file mode 100644
index 09a2aafadb15..000000000000
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A multi-system game emulator formerly known as bsnes"
-HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
-SRC_URI="https://gitlab.com/higan/higan/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
-REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
-	|| ( xv opengl sdl )"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	icarus? (
-		x11-libs/gtksourceview:2.0
-		x11-libs/gtk+:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	ao? ( media-libs/libao )
-	openal? ( media-libs/openal )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	xv? ( x11-libs/libXv )
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl[X,joystick,video] )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-header-locations.patch
-	"${FILESDIR}"/${P}-QA.patch
-)
-
-disable_module() {
-	sed -i \
-		-e "s|$1\b||" \
-		"${S}"/higan/target-tomoko/GNUmakefile || die
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		nall/dl.hpp || die "fixing libdir failed!"
-
-	# audio modules
-	use ao || disable_module audio.ao
-	use openal || disable_module audio.openal
-	use pulseaudio ||  { disable_module audio.pulseaudio
-		disable_module audio.pulseaudiosimple ;}
-	use oss || disable_module audio.oss
-	use alsa || disable_module audio.alsa
-
-	# video modules
-	use opengl || disable_module video.glx
-	use xv || disable_module video.xvideo
-	use sdl || disable_module video.sdl
-
-	# input modules
-	use sdl || disable_module input.sdl
-	use udev || disable_module input.udev
-}
-
-src_compile() {
-	local mytoolkit
-
-	mytoolkit="gtk"
-
-	# Needed for fluent audio (even on i5 hardware)
-	export CFLAGS="${CFLAGS} -O3"
-	export CXXFLAGS="${CXXFLAGS} -O3"
-
-	if use icarus; then
-		cd "${S}/icarus" || die
-		emake \
-			platform="linux" \
-			compiler="$(tc-getCXX)"
-	fi
-
-	cd "${S}/higan" || die
-	emake \
-		platform="linux" \
-		compiler="$(tc-getCXX)" \
-		hiro="${mytoolkit}"
-}
-
-src_install() {
-	if use icarus; then
-		newbin "${S}"/icarus/out/icarus icarus
-	fi
-	newbin "${S}"/higan/out/${PN} ${PN}.bin
-	newbin "${FILESDIR}"/${P}-wrapper ${PN}
-	make_desktop_entry "${PN}" "${PN}"
-
-	# copy home directory stuff to a global location (matching "${FILESDIR}"/${P}-wrapper)
-	insinto /usr/share/${PN}
-	doins -r higan/systems/*.sys
-
-	doicon -s 512 higan/data/${PN}.png
-	doicon        higan/data/${PN}.svg
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-}
-
-pkg_postinst() {
-	#elog "optional dependencies:"
-	#elog "  dev-games/higan-ananke (extra rom load options)"
-	#elog "  games-util/higan-purify (Rom purifier)"
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-emulation/higan/higan-116_pre20210404.ebuild b/games-emulation/higan/higan-116_pre20210404.ebuild
new file mode 100644
index 000000000000..53899e2c610a
--- /dev/null
+++ b/games-emulation/higan/higan-116_pre20210404.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=9a625c545ca89b094d5c1da40bbfa5d07156a4aa
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Multi-system emulator focused on accuracy, preservation, and configurability"
+HOMEPAGE="https://github.com/higan-emu/higan"
+SRC_URI="https://github.com/higan-emu/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa ao +gtk openal +opengl oss +pulseaudio +sdl udev xv"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[joystick] )
+	udev? ( virtual/udev )
+	xv? ( x11-libs/libXv )
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0
+	)
+	!gtk? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# insane build system, reinvents every built-in rule
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+	local makeopts=(
+		platform=linux
+		compiler="$(tc-getCXX)"
+		hiro="$(usex gtk gtk3 qt5)"
+	)
+
+	local drivers=(
+		video.xshm
+		input.xlib
+		$(usex alsa audio.alsa "")
+		$(usex ao audio.ao "")
+		$(usex openal audio.openal "")
+		$(usex opengl "video.glx video.glx2" "")
+		$(usex oss audio.oss "")
+		$(usex pulseaudio "audio.pulseaudio audio.pulseaudiosimple" "")
+		$(usex sdl input.sdl "")
+		$(usex udev input.udev "")
+		$(usex xv video.xvideo "")
+	)
+
+	local coreopts=(
+		cores="cv fc gb gba md ms msx ngp pce sfc sg ws"
+		ruby="${drivers[*]}"
+		build=performance
+		local=false
+	)
+
+	# Make higan
+	emake "${makeopts[@]}" "${coreopts[@]}" -C higan-ui
+
+	# Make icarus
+	emake "${makeopts[@]}" -C icarus
+}
+
+src_install() {
+	# Install higan
+	dobin higan-ui/out/higan
+
+	insinto /usr/share/${P}
+	doins -r higan/System
+
+	domenu higan-ui/resource/higan.desktop
+	doicon -s 256 higan-ui/resource/higan.png
+
+	doins -r extras
+
+	# Install icarus
+	dobin icarus/out/icarus
+
+	domenu icarus/resource/icarus.desktop
+	doicon -s scalable icarus/resource/icarus.svg
+
+	insinto /usr/share/${P}/Database
+	doins -r icarus/Database
+	insinto /usr/share/${P}/Firmware
+	doins -r icarus/Firmware
+}
diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
index 5bef912000c6..f23ba835ea1c 100644
--- a/games-emulation/higan/metadata.xml
+++ b/games-emulation/higan/metadata.xml
@@ -6,7 +6,10 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="icarus">Build icarus library manager</flag>
-		<flag name="udev">Enable udev based input</flag>
+		<flag name="gtk">Use GTK3 (Qt5 if disabled) user interface backend</flag>
 	</use>
+	<upstream>
+		<bugs-to>https://github.com/higan-emu/higan/issues</bugs-to>
+		<remote-id type="github">higan-emu/higan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/mekanix/Manifest b/games-emulation/mekanix/Manifest
index 6595ba51ea2a..9e62c80064c9 100644
--- a/games-emulation/mekanix/Manifest
+++ b/games-emulation/mekanix/Manifest
@@ -1,3 +1,3 @@
 DIST mekanix070.tgz 759553 BLAKE2B ffb8a0392edd8d4887cc668e2d18b5ad955e54bf4c53cc26a06c33a3364bb7db4bd5c6ee8e5406d2885e9c173b16b0894fcc2ee3a111d03c70ad8326920011e1 SHA512 9298d74c0ff7e8d13fbe79f13f2107ea966e6f2602bb3215207a76a433d9f705cd57a33db8295d44cb975e3735a510f23a189d624ea69b83ecfc7ba6509cc3df
-EBUILD mekanix-070-r1.ebuild 679 BLAKE2B 03115a73f83f54da9017a03001993b1cd6a12a51c0fdc06746f2d849f51629e5ee83f09cba2ec718a8a474ba889f3011136cdceb090e12b822863521c3919a25 SHA512 c5a7637cd16f2d8ae82a4d235f593e084d99c5626f09ebe7d717fa0093397a6672b5e5a4d02ab65138ef5d4ef738f1856571fa8d791aa376d8c232b0db608c69
+EBUILD mekanix-070-r1.ebuild 726 BLAKE2B bd8e0870a387334ecb941d4c5e0cb770e5a5aaaa67c37ee759e3f5a3e7bdfb2c7bc6c5cb12335eafcf868a38fc17953ef8b02541f0215c999425b5f25f7c4ed0 SHA512 bb2cd6597c43ea8d71f839e27ecfb1c317d6641a2ff6033bb4e0bbc1460b1c64ca49149974f61a94400d57c6ab84a0dcff640bc637ad6b78a183636b6aeb203a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mekanix/mekanix-070-r1.ebuild b/games-emulation/mekanix/mekanix-070-r1.ebuild
index 8148de4cd3aa..3b20dcd33cea 100644
--- a/games-emulation/mekanix/mekanix-070-r1.ebuild
+++ b/games-emulation/mekanix/mekanix-070-r1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils
+inherit wrapper
 
 DESCRIPTION="SG-1000, SC-3000, SF-7000, SSC, SMS, GG, COLECO, and OMV emulator"
 HOMEPAGE="https://www.smspower.org/meka/"
 SRC_URI="https://www.smspower.org/meka/releases/${PN}${PV}.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="mekanix"
 SLOT="0"
 KEYWORDS="~x86"
 RESTRICT="strip"
-IUSE=""
 
-RDEPEND="media-libs/libpng
-	x11-libs/libXpm"
-
-S=${WORKDIR}/${PN}
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11
+	sys-libs/zlib
+"
 
 # file verfies that it's an elf, not win32, binary:
 QA_PREBUILT="opt/${PN}/meka.exe"
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 1a45145201e9..684ddc7d479a 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,6 @@
-DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8.3.tar.gz 12013512 BLAKE2B 750c1bcb5cfe30e6e0965a16dbdb91b4dbf9f6b1068b7a9c343932c9b7b08c2b6aef4f7f4f38ee5d4e3ebb73d0f55222c78654be777858f36bd452b5f732e76c SHA512 8154cec08f9ab4fc7cedc7988ed8ee320ad076666e2958b4fa0620801398081aa4808b61dbafd2e7c4b9ff0edfbb761e013fd7117206e81478a6c09ef91e2a5a
 DIST mgba-0.8.4.tar.gz 12347906 BLAKE2B 7cea3bc3d291df5ac430685d261de1817798d24abbc2ea4d1fbffb55083ba130a80b6baec75513d616523daf28d0a74a53b5a1a657c1420b73caf6c5058093f8 SHA512 fe9c022211d03eb8a5db23901b2f99a5ee75a40f104e5edb2c6fd1a2860a37d9a3ba8d3b724b35ef958840986dd09002c58740a176290b415826e1a345d90390
-EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
-EBUILD mgba-0.8.3.ebuild 2624 BLAKE2B cccd71c843afb5f1028757a04b706303a4641ff0b30cf1157ebf3b12e0bcbead88a3d7a6593aa1d75bd44180edaf2cf38d964bd5fcd0c17aa013aa0a9fede16e SHA512 57891dead8324bfb0812e10131da5051b428b5071aaa2f9baa4e930fec5f20396fff965b9d25b273ab7cd4d44b328fc79ca9ba1ee39f6705e0065b3fffe45a05
-EBUILD mgba-0.8.4.ebuild 2632 BLAKE2B aaff9ebf6fef9e87a17a1d1f13b7afa81a23c86ce4f76383d5846c63ea173538dcc6939b019f3ce86fe85382d9e0b1b443feab47a6183c1fb9dcbdcacd8e1ffa SHA512 0329b090e0fc76b8db07410c442a6e38d867b968da599ec1f1eb6fc8441376098cf1ef280283b562ff2a38f5647b04c2b6cb532ad55953615819501bd36ad2f1
-EBUILD mgba-9999.ebuild 2632 BLAKE2B aaff9ebf6fef9e87a17a1d1f13b7afa81a23c86ce4f76383d5846c63ea173538dcc6939b019f3ce86fe85382d9e0b1b443feab47a6183c1fb9dcbdcacd8e1ffa SHA512 0329b090e0fc76b8db07410c442a6e38d867b968da599ec1f1eb6fc8441376098cf1ef280283b562ff2a38f5647b04c2b6cb532ad55953615819501bd36ad2f1
+DIST mgba-0.9.1.tar.gz 12795893 BLAKE2B ec2308721683b8f00ada740f5020bef5eb0ef2fc8fc241dae0d81f92c51c4d91bfa23950370e2f9a4184daa31552d8f03bcccef9abe10bb7657b8bffec529486 SHA512 f818bbcb8d38a2caced9ccb96aa81b392c5f75860af0c16848c9ce2046f17328829cf45a00b211326bfab86c3cac76ae341dc54ab91e1b548085b1d1198a2578
+EBUILD mgba-0.8.4-r1.ebuild 2659 BLAKE2B f5f2ab5f770ff8ba4ec4667ce7a40d262692cf2a52e2644591735ecd1f780478d4b3184d3ec453321950c7cd57a8817b1f8916c697d6f1382f9fd39da53d2d37 SHA512 92c02e4d249228bd4e3e5a3142877cdda4999e20db8b65f458af275f867d6f1e8d58af50f6f2b35d2bf2ebdce4f750d62704bdeffd5d8980ba64806d21f14112
+EBUILD mgba-0.9.1-r1.ebuild 2661 BLAKE2B 98a4d8cde1bcd85498e0b509199e709d40ef81daecc3ac0edeb8bfbdb20a8931fa1f7bf504d4d5f54f976b78fce2ee1653630493814e959f4cab914af097eb21 SHA512 72701cbe4fc6a168302d37cb3defb2c00563baad01f4210b7baa8ce3d9ae07498a3f32cbbe1df82ad54df71a42d68c90f96b73ea93e0742e7b39c23fb93d184a
+EBUILD mgba-9999.ebuild 2661 BLAKE2B 98a4d8cde1bcd85498e0b509199e709d40ef81daecc3ac0edeb8bfbdb20a8931fa1f7bf504d4d5f54f976b78fce2ee1653630493814e959f4cab914af097eb21 SHA512 72701cbe4fc6a168302d37cb3defb2c00563baad01f4210b7baa8ce3d9ae07498a3f32cbbe1df82ad54df71a42d68c90f96b73ea93e0742e7b39c23fb93d184a
 MISC metadata.xml 630 BLAKE2B fdf7e92057360a0292fa7d512b55a7493df4030d0b0a4e64fcc43fec8b530f2fd5ed33bd1a81c3847ac8db28b22a3e90a9fa0b906731730b1a7c37fdb62a96e5 SHA512 2dab9ea38d95993b9f69f7a039f158d9702279edaba0239b453cc96668167f83e9cb458247422e623ce3d2d45daeedd93fd1133f90ab691a0af11484d986e16b
diff --git a/games-emulation/mgba/mgba-0.7.3.ebuild b/games-emulation/mgba/mgba-0.7.3.ebuild
deleted file mode 100644
index bf269f2432fb..000000000000
--- a/games-emulation/mgba/mgba-0.7.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="debug elf ffmpeg imagemagick opengl qt5 +sdl sqlite"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	elf? ( dev-libs/elfutils )
-	ffmpeg? ( media-video/ffmpeg:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (>=0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_ELF="$(usex elf)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3="$(usex sqlite)"
-		-DUSE_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256 ; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.8.3.ebuild b/games-emulation/mgba/mgba-0.8.4-r1.ebuild
index d1d5df90464f..cef008e8c593 100644
--- a/games-emulation/mgba/mgba-0.8.3.ebuild
+++ b/games-emulation/mgba/mgba-0.8.4-r1.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
@@ -14,7 +14,7 @@ else
 	MY_PV="${PV/_beta/-b}"
 	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )
@@ -49,6 +50,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	# Get rid of any bundled stuff we don't want
+	local pkg
 	for pkg in libpng lzma sqlite3 zlib ; do
 		rm -r src/third-party/${pkg} || die
 	done
@@ -92,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
+		dobin ${BUILD_DIR}/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -101,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ../${P}_build/lib${PN}.so*
+	dolib.so ${BUILD_DIR}/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-0.8.4.ebuild b/games-emulation/mgba/mgba-0.9.1-r1.ebuild
index e34b02d22965..a9e24f62871c 100644
--- a/games-emulation/mgba/mgba-0.8.4.ebuild
+++ b/games-emulation/mgba/mgba-0.9.1-r1.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
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index e34b02d22965..a9e24f62871c 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.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
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )
diff --git a/games-emulation/mupen64plus-rsp-hle/Manifest b/games-emulation/mupen64plus-rsp-hle/Manifest
index d409b8cdb71c..a91423e3efb9 100644
--- a/games-emulation/mupen64plus-rsp-hle/Manifest
+++ b/games-emulation/mupen64plus-rsp-hle/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-rsp-hle-src-2.5.9.tar.gz 53889 BLAKE2B e66996ffbce1d4b2b40f1520f0806692652dbf7baa55a73f632f2dafe75f93093e0575bb1c7e63cc1cd8770c1cc0e6d59db9021fcb0fa2e34d707511dd3a40b0 SHA512 562f3a9d9eff01f11c13aca657fb6471f365fbfbe079ea5e1e6f0ad49b27ba04779bc86233bcacd20c95c79f7fa265f053b3fa4c2b12828c6a8992762c4b6963
-EBUILD mupen64plus-rsp-hle-2.5.9.ebuild 1405 BLAKE2B 82845f868656311d6a36539835db4c7730378b68e342d4d25ea6616bb0e5728a27cfefd69151e43d4472b01531695d5331904c3d98dbc403291f7da5e742d116 SHA512 7d5554bd4e866724b48ba928125b00929aa14d4ad3269d081a8320657894a6f6b424ec8b76c6e5cebdf64b2c17d7ad9bc62f9a533badd122bf817140057c49bc
+EBUILD mupen64plus-rsp-hle-2.5.9.ebuild 1433 BLAKE2B 5f1bc73654b3c3773b36bea57370ffdbb59f2ee91d700c5655cbef91539ad95836b9cbabbad30f9cfb4122f7e51ef85e00b617bfe4505c5141ce1ad33153144c SHA512 a9b27ad83a144829272dc55d31e5ce9027a922212cfee2165f1c92a42e37a6c0aa51c200ffbbaab88bb175b8d99ce4cddeaadecb178de52bcacaeec46a26d177
 MISC metadata.xml 343 BLAKE2B 997f47a4d8c1fccab5b16dd49ab4e791ec1ae114b820ad75839f981e9a72f409951a22abfbb68788ade5dcb1be2dd91aba4fc9771c00519307ee28455ab7aa9d SHA512 7ffba7fdacc44215dba6cf994646ea38ebf94870accc3d6150ca609fcf5dc7b343a52fe6fc0511e5741f24afc20b11c2e1104d39215f7cffdeaf1098efaf709e
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.9.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.9.ebuild
index 4d18794f870b..ca5c5d3f8e2c 100644
--- a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-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,6 +17,7 @@ IUSE=""
 
 RDEPEND=">=games-emulation/mupen64plus-core-${PV}:0="
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
index f9cdd9ebcf3e..55ecbc74c192 100644
--- a/games-emulation/nestra/Manifest
+++ b/games-emulation/nestra/Manifest
@@ -2,5 +2,5 @@ AUX nestra-0.66-exec-stack.patch 239 BLAKE2B 47255490442da874ddea390664928aa7773
 AUX nestra-0.66-include.patch 1297 BLAKE2B 98a52017fc1919fde5125771b267f0ef2b0c73ef29f81f3e2bac3672c6bab5be005028310d031486d143568efbd8ccf7c2d58c4d9bee9d5532e3ac872465fe83 SHA512 f95568a3433094555067a89c59a38519ee2bef6cdce8a0ba962976c5df6be3332fa18c0c4b6635c807ed2b22a40a75e22b9a26282b5e8190659f59c64f212389
 DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
 DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6
-EBUILD nestra-0.66-r3.ebuild 1046 BLAKE2B f36be92637c5125c5019b8c95ab8c8eb28a91999725c2a4de24ea76a46bfca945600dc0eab1b3ed4e8aa126ae7375192858f5d33d782fb087055043a1c77a0a4 SHA512 ae7ec1c29eb73c5cd9f478f84b517fae99dd0e7c3bc421e6850236577c260d35204fa37d6b78963012f1045b1ab30a3db1622feb1be156d93a159856093a4330
+EBUILD nestra-0.66-r3.ebuild 1029 BLAKE2B 42d9c2dd752ec37c39f3b4d819af573a0cffadb675b8122bceee5b1acea1f0b37e8f6e69d1cda0c246fca01cd13727414ef9f990c4f013d44e29a40c36641556 SHA512 4d6400b7aa07ad17356429c9d436a150f2a3befdf59db308c6a175f4fab27d02388eedec0791d88ca07d5e9b83d2764fda815b5fe03ec8a0d9c28fb97ef4b63b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/nestra/nestra-0.66-r3.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
index 44ca1daa1d33..73ec6ac19483 100644
--- a/games-emulation/nestra/nestra-0.66-r3.ebuild
+++ b/games-emulation/nestra/nestra-0.66-r3.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit epatch toolchain-funcs flag-o-matic
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
 
 PATCH="${P/-/_}-10.diff"
 DESCRIPTION="NES emulation for Linux/x86"
 HOMEPAGE="http://nestra.linuxgames.com/"
 SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
 	mirror://debian/pool/contrib/n/nestra/${PATCH}.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 src_prepare() {
 	default
-	epatch "${WORKDIR}"/${PATCH}
+
+	eapply "${WORKDIR}"/${PATCH}
 	eapply "${FILESDIR}"/${P}-exec-stack.patch
 	eapply "${FILESDIR}"/${P}-include.patch
 
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 65e805e6139a..6c6bee7657e0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,6 @@
 AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-EBUILD pcsx2-1.6.0-r1.ebuild 2844 BLAKE2B d9b207cf4ac343af83f0cfea554a52417f0a93c2a257f47548772a5f1038268b45dd3076b86a0ebf627dd6992280e0db6535a1fd1fcb8e26d6a7ac88caa0fa26 SHA512 70586cf8aa1ef5633fc353d90c1d4f651f2c0a6f4ff27763e6797175024e85b416a1c2f1694cc792f66ef23ccde7b2c9024ec2094b53b5eb81aab6c8bb6a1f08
-EBUILD pcsx2-1.6.0-r2.ebuild 2817 BLAKE2B d683ab3336aa6c2cccf4b800de701fcaf47073db6f6ef4cd1f5e244364f04870281d9d9168277c8ecf17f7c5dcd35e54c7ea8e009f0cfd86fd42a27d656cebac SHA512 0e88e5198ee8089992a1b36f06e1b2841df5552fb3f9bb46d89a56540c3df33e83cbd04012cfa62d78a5cbb7be1a0a10c3a136c20e84f27fcf4fb4c40e0b2d1c
-EBUILD pcsx2-9999.ebuild 2175 BLAKE2B 4f33ac335bb86e8e977177cdcc5c0d25fa71f4cedd74a67f0e3dd0880d01eaeff949e32491a3f7e377aaecb63f00281ca1640e4c4741f24dc9d8d2e89bf174e4 SHA512 1dc252b3afee9d379bab512da3824f65affd2c556745c12b5c77a672de9adeb3de1329196aa53428a10a589b4a8ae830373c2d03156f5283b12fbfa63929d6bd
+EBUILD pcsx2-1.6.0-r1.ebuild 2837 BLAKE2B 81174d609dd0c17ba0ac3a144c9bb2835dcc19f7065908dd6bf8de1b95bcadec7776bd85ea3efce6e01a104778e1168d4079575c907de052999b99278b647b1d SHA512 304662644fc9f70bcd1c464e63cc828f0323f1f748801d48d5185619c5897e0c84d849398b40a28369923d94cb28ca6aea0a9f9706cea2afba4af66187c88025
+EBUILD pcsx2-1.6.0-r2.ebuild 2810 BLAKE2B e24f4949ec6a0276c30582c94622c7f3cadd4102e6bc8aca391a3e9fb42450a21fa6c1b5a01778ac0fa41aa0fb130a35c367e45f7201c7d069644ee15edc58ed SHA512 5be56aa2fd4eb7a2bb883ae9ae8e1e16003211b77bbfebd911b1ea2d2cf51360ea41f320c7eef1d1c5d96dc68a5d49519ed1bcb31149344403529bd6577877f4
+EBUILD pcsx2-9999.ebuild 2246 BLAKE2B 6ab0052418f7c5be85b81277ffe01fffdac4ec8980b45441d55aca2a861088e20123206c803d1ac2c060d7c2ce1cecb0c828ba5b0edcf504958f5fcd244b9186 SHA512 96956f35137104711e3fed28cc10c2205d90cd8e3107525aee8deafa3d1305bfc73dcd2526e2dd9c22d62f5d9628aba5cd48aafa7b18c8eba1ac6a501c355ec2
 MISC metadata.xml 532 BLAKE2B 085f7d0ad0e79d279ac876f5be53f73dc2080efccf671b8c37bdd24c6ce8a5fd2d60afee10eb0d25eb2007c581fb512152f708e5d4031444ce4267ffd922cf34 SHA512 1db6dbcf78d3fe92c080a2d17748ca115f6e968ec23db16aea8cac219388270f0ea8eafe6ad61c9e6d8b3dc2d1b12ec5bbd88884d4e4dd19a294059123f2b898
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index c5dffc683898..7bdeda838f0d 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
@@ -96,7 +98,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index d394535a1003..a358ecfb9dae 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}"
 
@@ -93,7 +95,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1555b343b49a..acc1b5e7b76b 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=()
+EGIT_SUBMODULES=( 3rdparty/libchdr/libchdr )
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -22,7 +23,7 @@ RDEPEND="
 	app-arch/xz-utils
 	dev-cpp/yaml-cpp:=
 	dev-libs/libaio
-	dev-libs/libfmt:=
+	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
 	media-libs/libpng:=
@@ -38,7 +39,7 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/wxGTK:3.0-gtk3[X]
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
@@ -70,6 +71,7 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
+		-DENABLE_TESTS="$(usex test)"
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
@@ -81,7 +83,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index 5adc192bd5be..55b8af59e950 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,5 +1,5 @@
 DIST stella-5.1.3-src.tar.xz 1828448 BLAKE2B 1588e4da3c21ab51d967aa3fae49b14ef5f3121e3907aa83629dbabeab5c190660ad5a53319429f721cc93560c212f530a58675b7c543c9a3fed3e395669c145 SHA512 9aaf6118c999e90e4947e490f61ccebb82ba1ebeccb29b2e4ec1226bdeef83bb36d944791d6f915522c5c6fec74a0bd17ac5ce8fcc5f369281f9cedf06a380a5
 DIST stella-6.5.2-src.tar.xz 6220652 BLAKE2B 8bb51ff15b28436eb83b918ca6123956482e4342c4f9560dcea608a856899a65176c9012146d1a2affe22ee0a589e945424e897853890e23ff503d97b893e32f SHA512 dc7685fd166fad578bce62c961419755db7c4b8ac6e6e2e10f0edfa3b0f63bf43d64119483cc47fc86dfe95e09bc800c27392239aeb68a2ccf37d0f224d6493c
-EBUILD stella-5.1.3.ebuild 1366 BLAKE2B 0f23954bd4cba97df44df95de1a7d7339bae942e782251222dffdb0f99f3aab64bc351ef049582c0958f9219e64ac3909b096e634b6cc798f0c5b6ed4701eda0 SHA512 66a059738abbe5f6ddd75487fc0b6cf71c478b699ce2c0c00280ecc550b4794b082c8a3a902ee300d74922e296a69d5d08e8c06ad1f994a1d3152f0ff18e055d
-EBUILD stella-6.5.2.ebuild 1372 BLAKE2B e962a52d6fbc74cae9072f1e481c6e1eb1a91efca6a632c1733943a22146cf424bb802c67f854886e4e27c37fbb959a8cc282182dd94a3233883214f5721558a SHA512 b2560e7a120194c17993c6658ad50b23f2f77991e48d0512b6d9df199706713fdc5e58f298aeb7f3b59ada158e5dbe51d84ec237d8cba53a086da2a3f7463f7e
+EBUILD stella-5.1.3.ebuild 1353 BLAKE2B 4e9d723e1cf6b68e3c4acc2f5fb87fcd0af30989cb907dc43bbad83c3b8670f70b622486c8ad23a5c7e38f93b09303c0bd5c5182c91757782392da6203f6227e SHA512 9f39dc63c241d9fc4be281f3ba14f44bbfe935fca41ce16aa53c8284b770ae9a9f92de387f13b4f37e6225a0346b683ed51a1b74d000cd81124f22dde2a15f6a
+EBUILD stella-6.5.2.ebuild 1359 BLAKE2B b3eb5d424060af0ab7aefe4d6cf2c7762bc61b3c304cd288d4206364c144e6cd08f03bb000c97f0844f590ad8ce142717c95aa6c868d145b1bc5985c93944150 SHA512 d80e24ded2edac83a45e0acd21529e2b5337c6ee73e435ef46a3747a13010e3eb01beb328d86821a1bc6f61875f014b82dfac3c9d77dc6cf219a8667ef5e7b3f
 MISC metadata.xml 386 BLAKE2B 23b063450bf4b6915ed443ff8e9cc0c24858144c867085a6416f73b2299026ab85d4b07f18bbd54db37ce420803eb81561e87323e5eee0cdb99652de2c15d153 SHA512 6d69c2c3b88a206faaf9d80c1c1d8de01d1865bf800e4d4b7997dae4641f99665c0692251cf3d045e766be045069548e42cdb3303cb698f093501f2e79124fa1
diff --git a/games-emulation/stella/stella-5.1.3.ebuild b/games-emulation/stella/stella-5.1.3.ebuild
index 3e99f7a7aab0..e1a6bdf39dd8 100644
--- a/games-emulation/stella/stella-5.1.3.ebuild
+++ b/games-emulation/stella/stella-5.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
 HOMEPAGE="https://stella-emu.github.io"
diff --git a/games-emulation/stella/stella-6.5.2.ebuild b/games-emulation/stella/stella-6.5.2.ebuild
index c27cb7cd25bf..ae5e9b2d43b4 100644
--- a/games-emulation/stella/stella-6.5.2.ebuild
+++ b/games-emulation/stella/stella-6.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
 HOMEPAGE="https://stella-emu.github.io"
diff --git a/games-emulation/vgba/Manifest b/games-emulation/vgba/Manifest
index b0343e38d6c9..835997a98903 100644
--- a/games-emulation/vgba/Manifest
+++ b/games-emulation/vgba/Manifest
@@ -1,3 +1,3 @@
 DIST VGBA48-Linux-Ubuntu-bin.tgz 219565 BLAKE2B 3c00fae6b807e5a63ee719581e1e8a14ad123fa819e1f05008169435b4e2f06187f544e42d6a8b94ef1eec7f914ad3c3dd1282cf8186c67e69c2ac53c2d6ac53 SHA512 02362bad94ef93c8aa34bd18d8e6588aadd7d4218ce1c6307468877ac1ddadec073bca001c3d392db2554d937bee51541a76a8b2b15ea35a3c6db5822d6191bc
-EBUILD vgba-4.8-r1.ebuild 529 BLAKE2B 0f2787b236d2f207233a2ec7ac786c7530a007af7639d0cbc9870e0404b66fe755b362de183ee43e9b085af731ab2c007af160b3624272fd3ae6d018a2ff26b5 SHA512 b62c015b2a51d6380a284031ab69d4a2f71fd0d7c25d3d61558ce3db648d8a956af0a99400bf153b71aa7e66215f843781c98757def6ca82ac66a345550a2df1
+EBUILD vgba-4.8-r1.ebuild 579 BLAKE2B 1f8ab5a70ab4341297567f7dd813111a90332ac4c9d4f9a498256c897799e9dfc6da21cf20f7c63a0ca30531fa6136b7073c2a58fc3b38df6835f896fc1abb80 SHA512 cb8aa69bbd049894abf602c2e088699258e3cb084ede5d7466f4b0ae61f7b031e8da53e4314693394f228ba38ccfaed2d33d2594a9a7cb784af100654749f30c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/vgba/vgba-4.8-r1.ebuild b/games-emulation/vgba/vgba-4.8-r1.ebuild
index b3a974dbfd82..ed09e88a1abd 100644
--- a/games-emulation/vgba/vgba-4.8-r1.ebuild
+++ b/games-emulation/vgba/vgba-4.8-r1.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Gameboy Advance (GBA) emulator for Linux"
 HOMEPAGE="http://www.komkon.org/fms/VGBA/"
 SRC_URI="http://fms.komkon.org/VGBA/VGBA${PV/.}-Linux-Ubuntu-bin.tgz"
+S="${WORKDIR}"
 
 LICENSE="VGBA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
-IUSE=""
 
 RDEPEND="
-	x11-libs/libXext
-	sys-libs/zlib
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
 "
 
 QA_PREBUILT="/opt/bin/vgba"
 
-S="${WORKDIR}"
-
 src_install() {
 	into /opt
 	dobin vgba
diff --git a/games-emulation/zinc/Manifest b/games-emulation/zinc/Manifest
index abb9d51aa400..06b44e130693 100644
--- a/games-emulation/zinc/Manifest
+++ b/games-emulation/zinc/Manifest
@@ -1,3 +1,3 @@
 DIST zinc11-lnx.tar.bz2 305824 BLAKE2B d0328f1cdb1000eed54259bdd7801244b61d8936af8b95d8658c66241bdaacd7292095b4b86465f7617807870f2485b4ed11a8c203be917afcce6279d9d5e19a SHA512 8511ebb867347adfc00448a74548b4a22a2d854a14c663a626d33738e89d2cabd3248837a26d5ed099ef4dc40a0f451df639663774926e797ddc846a7270af4b
-EBUILD zinc-1.1-r1.ebuild 720 BLAKE2B c2086d73effa22b485389aaabd826078b364a3bb6f161113c4ec1f0de4b149c34799da0f5b18a37e79aebf88fc7cc9950ea20ffc5dc321e171c8cd8f9949cc51 SHA512 19e5d82276e64769f857a85097435177bd50af5ef8da6bd90355f689ac58b2acd059922e8977d644c18b50d4065f04d93a844c3e593c249065c8f3819bf030c7
+EBUILD zinc-1.1-r1.ebuild 874 BLAKE2B 6b84ea0edbeda1ac01fea585da265e99367d0fe3c7a47019f24d1dc777794e82d1efa29237240ae30afea0569241518888bc23a4681fddb03200f1e45c79e814 SHA512 e2a57da1e5462cd3be1c844d2fc6ed9585a3217ba18a1de58ac448742ae00bac9a70bc365c55bc76e3e34864c5629db6f29f92a4317d55e726bbd71f572f4a78
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/zinc/zinc-1.1-r1.ebuild b/games-emulation/zinc/zinc-1.1-r1.ebuild
index 69f75f4b58ff..3b6b67233a68 100644
--- a/games-emulation/zinc/zinc-1.1-r1.ebuild
+++ b/games-emulation/zinc/zinc-1.1-r1.ebuild
@@ -1,29 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades"
 HOMEPAGE="http://caesar.logiqx.com/php/emulator.php?id=zinc_linux"
 SRC_URI="http://caesar.logiqx.com/zips/emus/linux/zinc_linux/${P//[-.]/}-lnx.tar.bz2"
+S="${WORKDIR}/zinc"
 
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="strip"
+
 QA_PREBUILT="/opt/bin/zinc /usr/lib*/*.so"
+QA_EXECSTACK="
+	usr/lib*/libs11player.so
+	opt/bin/zinc
+"
 
 RDEPEND="
+	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+	x86? ( sys-libs/libstdc++-v3:5 )
 "
 
-S="${WORKDIR}/zinc"
-
 src_install() {
+	default
+
 	exeinto /opt/bin
 	doexe zinc
 	dolib.so libcontrolznc.so librendererznc.so libsoundznc.so libs11player.so
-	einstalldocs
 }
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
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-emulation
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)