gentoo resync : 30.05.2020

18 files changed, 101 insertions, 38 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7088e6ee8d72..d75ab7113c30 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 9f080e78e74c..2093b4f94f25 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -5,5 +5,5 @@ AUX advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch 4630 BLAKE2B 0655e2c87
 AUX advancemame-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
 DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3
-EBUILD advancemame-3.9.ebuild 1738 BLAKE2B 7f721d6c4074803c3c5aeca2bccbacb9a8bce0f808e60f365b1ced00d26a5a701970ace4f0fd35571a630c9a80b6e9754e11a1b6dd74ceda0a0972404335e1d3 SHA512 b6a3aca29ab87465501e2169bc55f7c72e8b08e75ee3d79a8b62feb17b082cde8b253883fba88169e531c7679d7bf219dcc214e6feed35823326661cd0274f86
+EBUILD advancemame-3.9.ebuild 1766 BLAKE2B 149fe1427b4a3d092be4034dea9ce4d5545f2643ec4a4f90426c4841bf73338e9700174ec19826734d364196b5d59c01cb81f936dd68b44a56f13012d84b51aa SHA512 d19c43726cd4adff7bee76c180279326791303bbb54972265cbb172fab3934fee5cde5005bd899e89b4fd534ff905029724ca80ccb30156577d33a784d9eaf8c
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild
index 94f891024387..61a5a35b78d6 100644
--- a/games-emulation/advancemame/advancemame-3.9.ebuild
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	app-arch/zip
 "
 BDEPEND="
+	sys-devel/autoconf-archive
 	virtual/pkgconfig
 	x86? ( >=dev-lang/nasm-0.98 )
 "
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index ca6267748ecf..f479067f853f 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -4,5 +4,5 @@ AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d5
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
 EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382
-EBUILD dolphin-9999.ebuild 4058 BLAKE2B 24179f389e66d6e5bcd6c7617b1382b1791af7e3af3be5707a01b03ce20425db04fa16275b75dcb206eca6bd46ad22385084fe01697bdee3459136e345baf263 SHA512 c33b89c469b5658780d97a69b8623288041ec78a98bfefaf3224977e8aaeffae22886ffe79f5b95270c61a70c708b41ceff4428756654aae67fd1a6f596a7c79
+EBUILD dolphin-9999.ebuild 4103 BLAKE2B 9320f4654e103c73b3588f53464e48e88f5058a21cb1456f4573de486fc3e77248f67202c536f94b4182575fc8fa23d6f24cc64624157c692e1e9bd2efe6ef35 SHA512 4b3419c5db0e73410f88d61c9b7e2df335b349887c93879d2c823ca8ec3920d2a20d6fc4902a87bc13e02cfda1c7ddd618f569d7deb11d9013e5cd88b37d2aee
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 30c89c3c2a9a..9645554b04fb 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -96,6 +96,8 @@ src_prepare() {
 		# 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
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 7b3b3d33444a..f147272c7ab0 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,4 +1,5 @@
-AUX fceux-2.2.2-warnings.patch 1306 BLAKE2B eb52e35f7933e1d194ca14b9d6a782f727e3b120ce8632f2b3db2036b06b7328d4dbf2f3e8fcd2cd27511f811b56e2840c943855076768598c0d899c59ffddc7 SHA512 75df61b98e94ce659a1cc9732a491cdcfe6b826ce9d8f9b22e5542217ade6074e86429cdcc326cb770a21fff049cf20760f8172c4b3ce52de1ee404ff5a7193a
+AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
 DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
+EBUILD fceux-2.2.3-r1.ebuild 1267 BLAKE2B e9d01faaa175d4eddbd269dead3629eac26baa8c167c35dc5ca5a8d3cbe17d6e378610cddadd2c51b7035bb83cddcdb3f4b99251d7f0217c6412095acd25c9a0 SHA512 fe10b5f2ab05b4bbba0115259b8fbc1f3583a41bd65fd6890bbfd7211d871e0bd1c9f40c89dacb7d9351da7a103bc00648492c61ceabd9f573b1e8a722d1af91
 EBUILD fceux-2.2.3.ebuild 1191 BLAKE2B 6471d82ac2f1ef1d0fcf36fe59b5b5d29c103f6c32739242c244fb834bd2fde62bf12e0c7f7c1eb6b0b2e59bdf1aefcbdb1f911ef144146f903b8be795d82439 SHA512 793f5ce80df5e0ee4b116fd89c68b6923a2fbf02cd54f632cddd69345289e783b61a2c6a09464efa21de4881bb3d7446a6ba1b2dc29c518d4caa26b52f3fd81f
 MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.3-r1.ebuild b/games-emulation/fceux/fceux-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..67080c8115f9
--- /dev/null
+++ b/games-emulation/fceux/fceux-2.2.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 desktop scons-utils toolchain-funcs
+
+DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
+HOMEPAGE="http://fceux.com/"
+SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk logo +lua +opengl"
+
+RDEPEND="
+	lua? ( dev-lang/lua:0 )
+	media-libs/libsdl[opengl?,video]
+	logo? ( media-libs/gd[png] )
+	opengl? ( virtual/opengl )
+	gtk? ( x11-libs/gtk+:3 )
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}"/${PN}-2.2.2-warnings.patch)
+
+src_prepare() {
+	default
+
+	tc-export CC CXX
+}
+
+src_compile() {
+	escons \
+		GTK=0 \
+		CREATE_AVI=1 \
+		SYSTEM_LUA=1 \
+		SYSTEM_MINIZIP=1 \
+		GTK3=$(usex gtk 1 0) \
+		LOGO=$(usex logo 1 0) \
+		OPENGL=$(usex opengl 1 0) \
+		LUA=$(usex lua 1 0)
+}
+
+src_install() {
+	dobin bin/fceux
+
+	doman documentation/fceux.6
+	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
+	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
+	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
+	make_desktop_entry fceux FCEUX
+	doicon fceux.png
+}
diff --git a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
index f0af4631abda..1d6c3ba46319 100644
--- a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
+++ b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
@@ -1,4 +1,3 @@
-diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
 --- fceux-2.2.2.orig/src/input.cpp	2013-06-15 15:44:11.000000000 -0400
 +++ fceux-2.2.2/src/input.cpp	2014-12-31 01:32:46.302001912 -0500
 @@ -1161,7 +1161,7 @@
@@ -10,7 +9,6 @@ diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
  		SwapSaveState();

  }

  

-diff -ru fceux-2.2.2.orig/src/state.cpp fceux-2.2.2/src/state.cpp
 --- fceux-2.2.2.orig/src/state.cpp	2013-09-18 19:03:59.000000000 -0400
 +++ fceux-2.2.2/src/state.cpp	2014-12-31 01:33:11.453155054 -0500
 @@ -1048,7 +1048,7 @@
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 160acb55bfa8..f066f1d42947 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -2,5 +2,5 @@ AUX higan-106_p1-QA.patch 3708 BLAKE2B 25f3707c4336e423017eb879e9dfc02fee9660ee8
 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 3207 BLAKE2B 71026e92c19174d24e381b33e4f765a81add3edba8afe8275fae29a035c2089bc749ebdc89c56654ddc817a8a6c5d3477523c64a9e22e538305788453d95b1b8 SHA512 f4db18b340730f2c7e92902590c8ed2d3f1ae3d247be05fc3aae6ef39d93e0e368aba56f84262b8c4d0f689761e57e52306a5952b76a890217a064b6409422d5
+EBUILD higan-106_p1-r1.ebuild 3149 BLAKE2B 86c071328cb25dfdd44f2b2b4e174d10539ded4cc7e59c12165372b51f4851192075a52a0c1b56ef938bff83f94c62e1dc14ba0f2ed72e8ec8769769c1881c5f SHA512 c476c684cd9b2d2dbab7eb9eb3f691cc249649b3bd1d3dfe9426d25f3d21dd5b8f7dc495b54cee0f1a86e7ee477f7aa8771786172a72ac1a3820dd07b3da62eb
 MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
index afaa222f9248..7f4b51fdf8b1 100644
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ b/games-emulation/higan/higan-106_p1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit desktop gnome2-utils toolchain-funcs qmake-utils
-
 MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
+inherit desktop toolchain-funcs qmake-utils xdg-utils
 
 DESCRIPTION="A multi-system game emulator formerly known as bsnes"
 HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
@@ -22,16 +21,17 @@ 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
-			)
+	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 )
@@ -43,7 +43,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/p7zip
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
 
@@ -123,7 +124,6 @@ src_install() {
 
 pkg_preinst() {
 	games_pkg_preinst
-	gnome2_icon_savelist
 }
 
 pkg_postinst() {
@@ -131,9 +131,9 @@ pkg_postinst() {
 	#elog "  dev-games/higan-ananke (extra rom load options)"
 	#elog "  games-util/higan-purify (Rom purifier)"
 
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-emulation/mekanix/Manifest b/games-emulation/mekanix/Manifest
index 81a175c542e6..6595ba51ea2a 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 680 BLAKE2B 769d7ef2e1e087445527d126a7788015eff61188d72c8ebb2c5199750363db246ce0d58ba2fd53b706421f085adef8559779459137346b3368d103975f369ca4 SHA512 9941de49f7231e2e4075ce87a918e90613565f93938d5a62faa8632a10d74906bbd1573164f70d8b7dfeb365e42e4f2dbf0211900874f629e165725ad047719a
+EBUILD mekanix-070-r1.ebuild 679 BLAKE2B 03115a73f83f54da9017a03001993b1cd6a12a51c0fdc06746f2d849f51629e5ee83f09cba2ec718a8a474ba889f3011136cdceb090e12b822863521c3919a25 SHA512 c5a7637cd16f2d8ae82a4d235f593e084d99c5626f09ebe7d717fa0093397a6672b5e5a4d02ab65138ef5d4ef738f1856571fa8d791aa376d8c232b0db608c69
 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 875e65fbf79c..8148de4cd3aa 100644
--- a/games-emulation/mekanix/mekanix-070-r1.ebuild
+++ b/games-emulation/mekanix/mekanix-070-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils
 
 DESCRIPTION="SG-1000, SC-3000, SF-7000, SSC, SMS, GG, COLECO, and OMV emulator"
-HOMEPAGE="http://www.smspower.org/meka/"
-SRC_URI="http://www.smspower.org/meka/releases/${PN}${PV}.tgz"
+HOMEPAGE="https://www.smspower.org/meka/"
+SRC_URI="https://www.smspower.org/meka/releases/${PN}${PV}.tgz"
 
 LICENSE="mekanix"
 SLOT="0"
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6e9dac5bad3c..4b69c1fce179 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,9 +1,9 @@
 AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-DIST pcsx2-1.6.0_rc.tar.gz 17914747 BLAKE2B e088997a7dc8632070f6bcb70defe0ea226fe250bcefd76ab7499d765ba38e7c249fa4e7048815c173fb2e529ef9cd7e139e03b5a178e5dbcaacab6442bb5517 SHA512 41da55efe0652dc2494c7266375a00f7942f45cfbc2602ab981739102876781c474e54758a9c556f189f7b2e34c81fd1f027cfbc4033fb3b817d63387a9c9db3
+DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 EBUILD pcsx2-1.4.0-r1.ebuild 2832 BLAKE2B ef3c11ebaba4a40d2f483628e266d312585fb8ed3366bf19a8fbcb45ebab6709483d4b4b32e20d4e77741257637f29d3891188c5dac58b372708b848d13aa684 SHA512 8b7cbbbca5b5dce6542571f52549600eb38679d74f2d6388533f08d5d8a0a59af136ac83c803894ea723528050e8638bd2b66a6434bdd33efec5fac497aa113c
 EBUILD pcsx2-1.4.0-r2.ebuild 2116 BLAKE2B c270c39b91613938a4d9eb3fc2742277521eb28d00d1c68877ab8322ede629be362cc6869d3229a13a4e99720b46068686acbd62f521ee8adc616426aaec0ec8 SHA512 905240f48058af46d6abe65c2c173fa463cff58a3d12cf074d282ede0d59044653a499db04e3ec96ae460da45189c3c67f9d2fac1a488bcdd671e03d5a779574
-EBUILD pcsx2-1.6.0_rc.ebuild 2673 BLAKE2B 0a8c480095485d8fef02dc3c89e2b0238e2b70a03e104659f75c38c919e158ac50c8007af7f44bab0a6baec10dfabc552f7a79e318c3c8b9964e599eb382a7fb SHA512 17f4517f7acd2dde7fbe7f3fb1d21bdb229b268a4e99da971be04d88d22645a9d286a366b52c38b54b41f4f4b3dd96de0355058eee2e6762d9e9ca931bd673f4
-EBUILD pcsx2-9999.ebuild 2595 BLAKE2B efef68306fe9695d494f40dfd7507ca15e7084906c4457570fbc2461c46c8f1d0126344dbae8584303dfc49c8eb5b20280ae90c7dc906c2c27f6ff9de4be15b6 SHA512 532385f0035cdeb56dcc36bb9746f11ec6056a0a87bfea66f0d005e3e051d478ee05c2621b5ccb5d3a90bfd28ea226a9a7f1d035b30c1d17b43ac0f12d0be657
+EBUILD pcsx2-1.6.0.ebuild 2700 BLAKE2B a1e54394c31cf5882ef2c681b69471da8d9eb5c155f6a410bc4c008e55abeb7045b539009e74c8829ae4c5f06eff263446e935efcfec305001093dabfab3608c SHA512 c55576bfc01aea39bd8550df4fcc9643176389046a1b6d68fad0a08d4e6dbc151464a07a0089ef81578335b2a44e470f92ef8b640295845c62a8ad8925af9814
+EBUILD pcsx2-9999.ebuild 2622 BLAKE2B 85b0c2becfb06ee1fabcc2a5a8ad3e05d571e3e4999b37543af9f79ca9113a7d9b39b7da3a1a65c9eada8d5fe2aa551b4e39735d9d511a89c1e56805f2529b01 SHA512 1c41b0b891571e849f5c4ef3394c7ac46fdef14adcc0db116bd585faf829814191d4fbf4bcd5a89dd99937ebadf4d6be88e9dd9b1aa7b4cc784e4e6c10f2ec54
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
index 58e7478a41b5..b264a1d56a5b 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -34,7 +34,6 @@ RDEPEND="
 	x11-libs/libXext[abi_x86_32(-)]
 	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 "
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
 	dev-cpp/sparsehash
@@ -54,6 +53,9 @@ pkg_setup() {
 
 src_configure() {
 	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
 
 	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
 	# if it something other than "Devel|Debug|Release"
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0f0a49453d1f..3de99b803123 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -34,7 +34,6 @@ RDEPEND="
 	x11-libs/libXext[abi_x86_32(-)]
 	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 "
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
 	dev-cpp/sparsehash
@@ -52,6 +51,9 @@ pkg_setup() {
 
 src_configure() {
 	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
 
 	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
 	# if it something other than "Devel|Debug|Release"
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index bd3f3b3bb8ba..3474dcbe2026 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -14,6 +14,6 @@ AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d
 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
 DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r7.ebuild 3225 BLAKE2B a76878c51ec13cca0183b61603a8f522e0e2ae91efec00e13bbecf65a41e5e632ea6de3c44320e886c5734279da75d801d0cf3d171c9d260b5da614ed6e10a78 SHA512 586a0d7b4b9884571510b8ed838f2bf4fb6bbb666de0fb2e53a8cd1ff7f8c9217d22b96c3f0c242323fd3d0399db80b815e4f5607d2c1f55b2aa309a4d8171cd
-EBUILD zsnes-1.51-r8.ebuild 3210 BLAKE2B ddac13b724161f5b7498610344841d9ad1bdc5ba9998410c6e2d94bcb1994e65d4a94b79663b62a2f5121b64e31926632394782625f592139fedd6842db44565 SHA512 fe54c3dcb02a3610e9f04c03a4ec9c45c247cfef1329ab7375c6114fbccb8113a54e883353d2c8fab6c54b36308b8bbd6b70288610c83039a49790db482eee83
+EBUILD zsnes-1.51-r7.ebuild 3226 BLAKE2B a5f1e0480df9f23cc17dd87cf033d9c750961dd3028d601ac6d8f58e0849ce65b4291f0ab151470351cd473e1ec807980dc4904971944bb87d8887dc82149324 SHA512 82a0e10da417343361948e18fed08fdc5da7283540563b450c8897bf76d08f9ba05436810aeabe5ec43a82ff5a7632892cea7cc06d5d59ba7093f13c997e3c68
+EBUILD zsnes-1.51-r8.ebuild 3211 BLAKE2B e6d0c1a02743df48f3aacd130559ecc1d0b0d6002ce927bb73747149eb3a8da200365dbeb3b926f091ffc23514f73c14b13e3f9ad742d55983dacfbde451c9a7 SHA512 bef59012c2fb36aef65dcdebe2450a6b52f036fa13fe0c7ede478caafdf67084129d5a6c38fa68fad3f083e054a0af6cda13a3622a32211b59bb0c7b67621463
 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
index 1d2c43f55fa4..f06068a089fe 100644
--- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
 SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/games-emulation/zsnes/zsnes-1.51-r8.ebuild b/games-emulation/zsnes/zsnes-1.51-r8.ebuild
index 1139717f6e2d..dd6efef7ca8d 100644
--- a/games-emulation/zsnes/zsnes-1.51-r8.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+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"