gentoo Easter resync : 12.04.2020

23 files changed, 161 insertions, 330 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c3d192e1eb6d..72ca59342dd4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d098fe45af3b..d90119ec4f80 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 4650 BLAKE2B dcef48d6adcea1d7492bf420c07de683429084078a8bd26f82218a37efe1a7f439f503b2d35e6c333662d2877a6aa9d8d2c43fac8ad985be1ab1c36f07446d69 SHA512 b944843c72c2280bf403768cf10486216cbc31adf08508c1467e1220ae11f72fcc94f6379b3a6e972f64811b60976cc29ccf07722212f117ae2b97c7f8b057bc
-EBUILD dolphin-9999.ebuild 4098 BLAKE2B d9631feedb51536dc6ab0c1b8a5f7e6f8b248ac367ae6cd1f7ab70c8f3ec8e0f1791d1ccb7adf94ec5268d8852ed0a9e491ad18d9daa07adc1e9c0be4dcd2728 SHA512 062c3c5f1d79564e23086a9659d74b55eb21c52fda3c83196e2765fc0866c30302162cf84f8ced5cef15acc4d84523d5f8723187b659e410ae1ff267fb4f9d1f
+EBUILD dolphin-9999.ebuild 4112 BLAKE2B 8dae6c5251aa8141a5a23de2d510842ebcc806d4bd7bec7207e3c5f7366b046d4ffba64d75e3b3f48c4eeee83f337d04673ffa3b33a92cc7756aef61c8d5f56a SHA512 acd26148eb78ee77ba0392e0268a321c2da6be7abbfb675cd5feda5a2411ce93bc0e9c6e15bd51bf5de71bae75619554ca45ea882d0fa421ee8319648b1d0055
 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 896e7895e99b..ba80667dcd71 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -26,6 +26,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav log lto profile pu
 
 RDEPEND="
 	dev-libs/hidapi:0=
+	dev-libs/libfmt:0=
 	dev-libs/lzo:2=
 	dev-libs/pugixml:0=
 	media-libs/libpng:0=
@@ -83,7 +84,6 @@ src_prepare() {
 		FreeSurround
 		cpp-optparse
 		# no support for for using system library
-		fmt
 		glslang
 		imgui
 		# FIXME: xxhash can't be found by cmake
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index d650f0d670b1..4561fb0d5570 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,4 +1,4 @@
 AUX mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch 520 BLAKE2B 1a72237a46105840d90e25a551e5ffab3f35f8df9f975da6f65c135847aac71fbf2e7fb9899c05720cb29b31ea85a15d86167c95993b93d763fea585ae0a4bff SHA512 95860397c764a6a21faaab45e13f68aa6b5da15ff1b96a430a263aaac918495b27a923c639166a9f124c0e3f3d2af6a3947aed34c3a590abc2e3033ef8460bd9
 DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
-EBUILD mupen64plus-core-2.5.9.ebuild 2523 BLAKE2B 52bd75d9456d3ea25404bd050623f0cea9a0667399415c6c13dfb7c14c10801e4ea5c37650aeaaec7d109b32e5a8c7c0bf76b7f3d7b2bd07737b41074d00c56a SHA512 f6aac01f3e0c9c3e6c5a48bcecb6d1373eb38afffb774a57ee6d4c6e0a353a200c21f71ed18cb989c067ba46e53f0f5a3e7bf68af65a6712b387d86730e432aa
-MISC metadata.xml 1042 BLAKE2B ef5f55643b1264d3c48e20f63df5a754c17f2dd4012bd6133c6bab0868ca3f8f4b00c309c041efead11ff64a783653d7df6c800d8eea504bfd7a3ba049b7f351 SHA512 a38ea381091a52abe63c786bae44191c0318dec24d2ed9d1db9b4d94b932441dc385adea652dbd82377cfb30bcb12d77ffbd44b41fddfcddbe289d084c59d132
+EBUILD mupen64plus-core-2.5.9-r2.ebuild 2544 BLAKE2B cf26c31daf09cf89065b7413e311ed88def0359973e2103d3abc9445b89b7a256975e3036f4fffbbaff1b849b7f10d80695b51322c69ab2954ca23ccbe3c80c3 SHA512 0a036738de5f0b16c124c7ffbc06fb5bf403d22f47dfbe19941093f5f1441ff14c8154715920ae0134d38dba86feb3c7de60f4734bf20c634c8b3d2e4d3b34a9
+MISC metadata.xml 986 BLAKE2B b3af4fa2d51776a6d5262490ea9b5d4a9fad211261f43cb02fffbf973a90ee515c6042e94931f07b440930aaca82ed15ffa17484fa2cde082655fadc5f1766ca SHA512 ec66e37a84c3ab9d66f00235cb8d430ffa31be0e76e56c3ca05900ed2aa9f33671626b70b9ce3fe936b836498a164217ead0f8637929d9d719979a1e7473b5e5
diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index 4e8fd61a24ba..d4cc98359e4b 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="debugger">Build the debugger</flag>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
 		<flag name="new-dynarec">Enable new experimental dynamic recompiler implementation (only for x86 and arm)</flag>
 		<flag name="opencv">Support video capture via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="osd">Overlay emulator messages using on-screen-display</flag>
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
index 5bf2f73d58f8..99d93cc23581 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
@@ -13,12 +13,12 @@ SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.ta
 LICENSE="GPL-2+"
 SLOT="0/2-sdl2"
 KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2 lirc new-dynarec opencv +osd cpu_flags_x86_sse"
+IUSE="debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse"
 
 RDEPEND="media-libs/libpng:0=
 	media-libs/libsdl2:0=[joystick,opengl,video]
 	sys-libs/zlib:0=[minizip]
-	gles2? ( media-libs/libsdl2:0[gles] )
+	gles2-only? ( media-libs/libsdl2:0[gles2] )
 	lirc? ( app-misc/lirc:0 )
 	opencv? ( media-libs/opencv:= )
 	osd? (
@@ -30,7 +30,7 @@ RDEPEND="media-libs/libpng:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="gles2? ( !osd )"
+REQUIRED_USE="gles2-only? ( !osd )"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
@@ -82,7 +82,7 @@ src_compile() {
 		OPENCV=$(usex opencv 1 0)
 		DEBUGGER=$(usex debugger 1 0)
 		NEW_DYNAREC=$(usex new-dynarec 1 0)
-		USE_GLES=$(usex gles2 1 0)
+		USE_GLES=$(usex gles2-only 1 0)
 	)
 
 	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
index ad47ccc15eb1..d4f6e149e353 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ b/games-emulation/mupen64plus-video-glide64mk2/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-video-glide64mk2-src-2.5.9.tar.gz 498350 BLAKE2B 8378cfc9fe624b3441e290d44d600e30a85393aca5a5a5867fb778a665ea0718ae15ba67ce5b62930cd4feffb7b1ddce88be6434de9791c82a979aa8f022ecd1 SHA512 cc4cce1a1f036cdda0748cf9eb758f21ba08dbe83a2844cf92d3e781102aaa3556934ca01dbae248a2d93c65209932b858988030beaa29395d79df70bf479bd4
-EBUILD mupen64plus-video-glide64mk2-2.5.9.ebuild 2025 BLAKE2B 30fe25231d9ac1f73b06308f2ba6e4ecce7115ab765fe744c336850d042ba70c9c67e54a959ddd3a14b8a050fbc539f3f5e00e963d645dba74f7da2a6737dfc7 SHA512 61dd57ec9d9ed6eec643ebcdffc693df50b4b1d8bb174ccf469324acd7209973ef40ffce674a4287cb17e5d1daa3c7a6664d84ce51f6d430d42d4aa1783a2bfd
-MISC metadata.xml 519 BLAKE2B 813c2f38ed09e91141b852fa42ac0b979878f7cc3496a9156c422efaac15503e5f5e0bf35f0583cc4011e041a09048add83655da0e96fb35129ae9b0004f03fd SHA512 6b8cf03f4eca8e66800437e90dc66febe000fb6d1710bbac2c6f4b9d83da4c6757baecda7b49bb5b44a524c7d9f48d61b593f88ade68269587a0068ca724415e
+EBUILD mupen64plus-video-glide64mk2-2.5.9-r2.ebuild 2046 BLAKE2B f849cf10356fb7c5e5cec039dc2b2e70d192ece010731169e82f2c9e58cd68b70e79e31e05a40b7ae884b7123e8db1be7c1f73498c9093b1ab6c472d6b9577d5 SHA512 e7837b5333b651fd1ac94b5fa6023d6f427b533554c82c150ea7dd8acea9de1098693494a5579c44cab510291664aa3cadf9454ba870666a8b010cdea143b77a
+MISC metadata.xml 463 BLAKE2B 6cbcef1504069cd790502a5af6d9d70f4eae6e581dc8afad5aaa1f39f2f1820dce233b4189a27814883c97b921bafc03bdab3909d34836459a7be1204a39c957 SHA512 7dd33f57017886cad81d7a745b9c1a49a3d1de8b66e241c97fbbd90884d1dd9c3e53a37565c7b0e07e48761fe5620fe101be7c57b38fe642d9e3bed93f609b45
diff --git a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
index 5bca97be8c20..fe3dec21151f 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
+++ b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
 		<flag name="hires">Support hi-resolution textures (requires <pkg>dev-libs/boost</pkg>)</flag>
 	</use>
 	<upstream>
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild
index 6372f0107c02..47affa118921 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.ta
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gles2 hires cpu_flags_x86_sse"
+IUSE="gles2-only hires cpu_flags_x86_sse"
 
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2-only=]
 	media-libs/libpng:0=
 	media-libs/libsdl2:0=[video]
 	sys-libs/zlib:0=
 	virtual/opengl:0=
-	gles2? ( media-libs/libsdl2:0[gles] )
+	gles2-only? ( media-libs/libsdl2:0[gles2] )
 	hires? ( dev-libs/boost:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -72,7 +72,7 @@ src_compile() {
 		NOSSE=$(usex cpu_flags_x86_sse 0 1)
 		HIRES=$(usex hires 1 0)
 		USE_FRAMESKIPPER=1
-		USE_GLES=$(usex gles2 1 0)
+		USE_GLES=$(usex gles2-only 1 0)
 		# use bundled lib
 		# https://bugs.gentoo.org/654470
 		TXCDXTN=0
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
index febe989235e1..472bead79633 100644
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ b/games-emulation/mupen64plus-video-rice/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-video-rice-src-2.5.9.tar.gz 300964 BLAKE2B 652d6642b743703488465883de2fe1e83e873316f133322fce343a6c8f3be37f351a1a91bad56ee1b4568afcafee55c1cb3cd6679159e24c552df63174751376 SHA512 98be11217024408e7c61120e7eb3cf83d6c9f666a029c7d0e85790c885c99e795336a8fa4f5029e546eba8cc139c6a5e84dd6c2ae5c60784a90c27ce58cd0603
-EBUILD mupen64plus-video-rice-2.5.9.ebuild 1837 BLAKE2B 2e8db70b5dc5a362387c484b6dbc037189508663743ced010374f9c6fa0dab48ba279100a42e5b70e6b306007587508032e482316a9b62d196fbbf423b459bea SHA512 19f12ab31c756b45a38c062e424743909f115829a5aad126dc5dc1e75058dce2459fb613d36a2112887d9746e4d3a8dcb947863ea13d8f024f1cd5cb40618908
-MISC metadata.xml 417 BLAKE2B 8510b7d913205c08c30afab179d14342bef943520adc195a25dba626d2e24406cb7108c0fcf6c0f0648612d8f9c458661aee4cef60b7b44fb30eccfc10926615 SHA512 620411630a55162b14abef6e6b62a5621de4d53e8bf467faa07f4aa114d7e4be4123f5ef9033cbbe04635e71255ad63f16303eb7b511a3ce151627e54d7d3bb6
+EBUILD mupen64plus-video-rice-2.5.9-r2.ebuild 1858 BLAKE2B 66708b55ea0edcbfa8202dadd0f65b38465bb9b7459842f6f46e578b5261b8c502f5577d25344556d7b36b692acc8638a0e783a9d78c0d1c5b3a6919756e5762 SHA512 9ed85fb8fd262da2c4d1b5def7a248a3415ea657fbd4c422220ce69f46dfb8802a5c69dbb4714b7111974f054e12bda1743a2405e6835cbd77863de47e11b3c9
+MISC metadata.xml 346 BLAKE2B e8e8b99a57f8ff54dcaedfca0b1c6ac65f8243c195374bc7b9591e435410f80767aea87a5526d1baecd5fa14889d8a90ba386cb5e732081aac6f771c3b76503f SHA512 a97be2ea2365ddd82e4693c3e4bbb3186ca2ef5a17ae8f3a6a6d07467ccaec1b27a22ca277fe6ceb1b773dff82a4a0dd0eb6f68690cc809cb51022c76ba924ca
diff --git a/games-emulation/mupen64plus-video-rice/metadata.xml b/games-emulation/mupen64plus-video-rice/metadata.xml
index 6df8a44e7777..2fe7b9cfc1ec 100644
--- a/games-emulation/mupen64plus-video-rice/metadata.xml
+++ b/games-emulation/mupen64plus-video-rice/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<use>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mupen64plus/mupen64plus-video-rice</remote-id>
 	</upstream>
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
index 07453e8b3b5c..14f93d58dc90 100644
--- a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,13 +13,13 @@ SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.ta
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gles2 cpu_flags_x86_sse"
+IUSE="gles2-only cpu_flags_x86_sse"
 
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
+RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2-only=]
 	media-libs/libpng:0=
 	media-libs/libsdl2:0=[video]
 	virtual/opengl:0=
-	gles2? ( media-libs/libsdl2:0[gles] )"
+	gles2-only? ( media-libs/libsdl2:0[gles2] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -67,7 +67,7 @@ src_compile() {
 		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
 
 		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
-		USE_GLES=$(usex gles2 1 0)
+		USE_GLES=$(usex gles2-only 1 0)
 	)
 
 	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 673c87722138..6e9dac5bad3c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,7 +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
 EBUILD pcsx2-1.4.0-r1.ebuild 2832 BLAKE2B ef3c11ebaba4a40d2f483628e266d312585fb8ed3366bf19a8fbcb45ebab6709483d4b4b32e20d4e77741257637f29d3891188c5dac58b372708b848d13aa684 SHA512 8b7cbbbca5b5dce6542571f52549600eb38679d74f2d6388533f08d5d8a0a59af136ac83c803894ea723528050e8638bd2b66a6434bdd33efec5fac497aa113c
-EBUILD pcsx2-1.4.0-r2.ebuild 2118 BLAKE2B f03bf636e906f6e8be56fe4e1b49d47bfb0161882f20df0b45ed5bb36af936890c81d78296b3387f6dfd069d51cd8e85bc94accdfbf6620ade9406f3460aacfb SHA512 3480a4b9978f5324d81752f2e4a5f372c8becb7c89f6805c3852156f428f362253735d52d94d2ee82f95e9f3447c5bba9c2e1c5fb150ed3bbde8d6dcda03452a
-EBUILD pcsx2-9999.ebuild 2554 BLAKE2B f8276a31cf0ec8f58526fc13223e4efabe915a1981965c3512fbc3634a45bf01c1e0d8adfb83c4acc5d66b7a49da2ef63d634ff2242a23dfb336cde98fdf4817 SHA512 fffd03d4fdb32c99a6aaf7380231d1aa4791fb0b5b3c61b9f404a5f2d39ae85432f41003393ad1e9173149a15caa7eca053d688aaa466b482b77d419a32dc475
+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
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index 23f15b711cbf..fc48152454b4 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
new file mode 100644
index 000000000000..58e7478a41b5
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://www.pcsx2.net"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2[abi_x86_32(-)]
+	app-arch/xz-utils[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[abi_x86_32(-)]
+	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]
+"
+# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
+DEPEND="${RDEPEND}
+	dev-cpp/pngpp
+	dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	fi
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	if use amd64; then
+		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+		# https://github.com/PCSX2/pcsx2/pull/422
+		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+	fi
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DDISABLE_BUILD_DATE=TRUE
+		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DEXTRA_PLUGINS=FALSE
+		-DOPTIMIZATION_FLAG=
+		-DPACKAGE_MODE=TRUE
+		-DXDG_STD=TRUE
+
+		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DDOC_DIR=/usr/share/doc/"${PF}"
+		-DEGL_API=FALSE
+		-DGTK3_API=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
+	)
+
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	cmake_src_configure
+}
+
+src_install() {
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake_src_install
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3d4ef37cb3a3..0f0a49453d1f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -76,9 +76,11 @@ src_configure() {
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
 		-DGTK3_API=TRUE
+		-DOPENCL_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
 	)
 
 	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
diff --git a/games-emulation/pcsxr/Manifest b/games-emulation/pcsxr/Manifest
index 1509a54b8901..06994f0e91eb 100644
--- a/games-emulation/pcsxr/Manifest
+++ b/games-emulation/pcsxr/Manifest
@@ -1,9 +1,4 @@
-AUX pcsxr-1.9.94-disable-sdl2.patch 1059 BLAKE2B 6421cbf6f2df49c2c61cc83602c13b4189781b30ecf3a1f605e537ad0b1c97205c65cd1c51fd58c1b6c0fa4027b7163e9d82228136ccd7bcc508f5917ab46248 SHA512 aa010d8203a45ddd7f93fcc74d3ec9010dcdf6a79d36bb72aa434caccac650c2dee5a74e52e11e40b35356ca30d9a37a52b5e76dcacba64634988b9e57c74171
-AUX pcsxr-1.9.94-ffmpeg3.patch 1890 BLAKE2B 74bd342c5ffb1cd8cc280add5b89aee448d180356e5cf7eb8252414d933c83ee5e0045146e3953f219b4330c2df2e5a4f68c0e07c4d5c1060d1708c2229455ad SHA512 091c435337468aa958c5b6e87a0ce5730675d9f8d109474c92d5e1d61830a8b4c525f8e3208e86654baca5ae602a39bc234a0c54b24b4f51a1297fb123852dc3
-AUX pcsxr-1.9.94-zlib-uncompress2.patch 1522 BLAKE2B c872121a676d42f6855359eafa50be57e42a573ae2b470463fb25322cc5e7004c443de7bb214a55bfb9a99c4f88026892313301fe1c4960e823c842889f28966 SHA512 28350e042810a8f1c3829891d68b028b4c464b75e614f8451f8708bbff0ee47e94146a05cf5e6e3fdfe6ca7eae2e839fc8cbf95df8458e28e3d025feb728c310
-DIST pcsxr-1.9.94.zip 2631125 BLAKE2B 686503faffccc820bcac73bc69056ffe05176779ee49b834ce0da84c40a047b7882ca7b91a7b7f95ab153329ca6368ae545bbe567cac6a9bdba1a434c397862c SHA512 c49471c27692fbf22da32d2f5697a1dfed3dbdbfdb86cb789b0ea6cddb2a7da4f3390e4568f4e9385bf30d6baff0f2a591a80f424cf0c640cae0035ba81dce39
 DIST pcsxr-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz 2229537 BLAKE2B 2f5c11c16d79b6747ccc5f7c655e99663a882e264548c136ff6d4b1321788a10b1475c023e0c7e0892aeb94032c522f2a0e6312e6cf66f608e1a1d7897aea809 SHA512 894e795c3616bb6abf87d144e1a2409142d457f2f2c04c4287e2804bb06caf008f42501089d555b5e43e6b2d6d2e8ac9a7d78842bed975b1b4b94465f4ed3a3c
-EBUILD pcsxr-1.9.94-r2.ebuild 2675 BLAKE2B 475bdfe5e53828f78b434cb6c1ea7b86deb7bfbfe83b470f4f6e54fc4ce6f0308e4329883d8564734fc1d1e178179e8e47aeeb8f6a4280078131149b59599f90 SHA512 1210b0fac40c7f310efefaea9342ac4a9a89e6eb366ac7de4db87385627a297947e2cc0d3cbfc3b00104f0c58c41f3aebb2bc6222a7d10f489969f3efcc6960c
 EBUILD pcsxr-1.9.94_p20190306.ebuild 1978 BLAKE2B e7afb0cd341e2542c24d574f2992d7ee0a08d66070a49076f3d88f066540a68e886a61401913dce2e5472e0f79ea0c14321fcd6e61abe6c74688bd3371faf8e3 SHA512 975902f5228f87ed6f0211dd44fe0094bf2f2ee3b8815cd8be0a33925ca51213fff90b71e05680966786e4a25cdfad12c611df2000fb4b368102b0c876c9f980
 EBUILD pcsxr-9999.ebuild 1835 BLAKE2B dea87b49445728421ce526125f1c7e2c4010c0b5d5c80122cfd69ce8de554b5ddb79e26e58e4ebbeaba4520fdcf0e9f3e29c7b9e83644ff47d362594e409287b SHA512 5ec3d28c7f3fb2c705617a94cadbbc215e29af59705955475e18b4f39e36859da9588ee6f97aa9ec63ee8af2a1d6ab37e84673728cee2efa35d9e235e7fdcbb0
 MISC metadata.xml 552 BLAKE2B 648df03f4c540bfca3e45d71cb88e03016d6fbb5a72e5040014d1ca4cbfc8516fcc064820e015982a0f4a70d816b2da9485abaee6d107fe1b6375fede65b652c SHA512 facef188db74c8ca89b4e67a76857e20e3bac6efb44a1aa104aa4a825ef62987aad75f8560c92588ae972428d7035bf2399130209dfd8ed00a9ae5beac4c956c
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch
deleted file mode 100644
index 483ea56660e6..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b7864d1b8db75eda19a7601f3e2402a885bb251d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 11 Dec 2013 17:19:09 +0100
-Subject: [PATCH] Disable SDL2 check for Gentoo.
-
-The SDL2 support seems immature at the moment, so we'd prefer pcsxr
-using SDL1 even if SDL2 is installed.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f79cee0..0c79cff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,8 +26,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
- PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.20, [], AC_MSG_ERROR([*** glib2 >= 2.20 not found!]))
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 , [], AC_MSG_ERROR([*** libgtk3 >= 3.0 not found!]))
- 
--PKG_CHECK_MODULES([SDL2], [sdl2 >= 2.0.0],
--   [AC_DEFINE([HAVE_SDL2], [1], [Use SDL2])],
-+AS_IF([true],
-    [PKG_CHECK_MODULES([SDL], [sdl >= 1.2.12],
-        [AC_DEFINE([HAVE_SDL], [1], [Use SDL])
-     ], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!]))
--- 
-1.8.5.1
-
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch
deleted file mode 100644
index 345ed9993ea4..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/libpcsxcore/cdriso.c	2013-11-09 16:24:14.000000000 +0100
-+++ b/libpcsxcore/cdriso.c	2016-12-12 01:02:25.652521029 +0100
-@@ -266,14 +266,14 @@
- 		}
- 
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available."));
- 				avformat_close_input(&inAudioFormat);
--				avcodec_free_frame(&decoded_frame);
-+				av_frame_free(&decoded_frame);
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
- 		if (len > 0 && got_frame) {
-@@ -285,7 +285,7 @@
- 			fwrite(decoded_frame->data[0], 1, data_size, outfile);
- 		}
- 		av_free_packet(&avpkt);
--		//avcodec_free_frame(&decoded_frame);
-+		//av_frame_free(&decoded_frame);
- 	} while (moreFrames >= 0); // TODO: check for possible leaks
- 
- 	// file will be closed later on, now just flush it
-@@ -294,7 +294,7 @@
- 	avformat_close_input(&inAudioFormat);
- 	//avcodec_close(c);
- 	//av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
-@@ -340,12 +340,12 @@
- 	while (avpkt.size > 0) {
- 		int got_frame = 0;
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysPrintf(" -> Error allocating audio frame buffer. Track will not be available.");
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
-@@ -383,7 +383,7 @@
- 
- 	avcodec_close(c);
- 	av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch
deleted file mode 100644
index 616084b797cd..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dabb671947ae26942c7ef8a71fef9831e0c1884d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 26 Jan 2017 18:14:01 +0100
-Subject: [PATCH] Fix build against zlib-1.2.9+ (having uncompress2)
-
----
- pcsxr/configure.ac         | 3 +++
- pcsxr/libpcsxcore/cdriso.c | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac
-index 300bb185..128b4f97 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then
- 	AC_MSG_ERROR([unable to find xtest headers])
- fi
- 
-+AC_CHECK_LIB(z, uncompress2,
-+[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ])
-+
- AM_CONDITIONAL(USE_LIBCDIO, false)
- 
- AC_ARG_ENABLE(libcdio, [  --enable-libcdio        use GNU libcdio for CD-ROM support (default=no)],
-diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c
-index 04e866d9..fb7f28a5 100644
---- a/libpcsxcore/cdriso.c
-+++ b/libpcsxcore/cdriso.c
-@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
- 	return ret;
- }
- 
-+#ifndef HAVE_UNCOMPRESS2
- static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
- {
- 	static z_stream z;
-@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
- 	*out_size -= z.avail_out;
- 	return ret == 1 ? 0 : ret;
- }
-+#endif
- 
- static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
- {
--- 
-2.11.0
-
diff --git a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
deleted file mode 100644
index b58d16a4d360..000000000000
--- a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune versionator
-
-DESCRIPTION="PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator"
-HOMEPAGE="http://pcsxr.codeplex.com"
-# codeplex doesn't support direct downloads but GPL-2 doesn't mind me
-# mirroring it.
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="alsa cdio ffmpeg libav nls openal opengl oss pulseaudio +sdl"
-REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )"
-
-# pcsxr supports both SDL1 and SDL2 but uses the newer version installed
-# since SDL is not properly slotted in Gentoo, just fix it on SDL2
-
-RDEPEND="
-	dev-libs/glib:2=
-	media-libs/libsdl:0=[joystick]
-	sys-libs/zlib:0=
-	x11-libs/gtk+:3=
-	x11-libs/libX11:0=
-	x11-libs/libXext:0=
-	x11-libs/libXtst:0=
-	x11-libs/libXv:0=
-	alsa? ( media-libs/alsa-lib:0= )
-	cdio? ( dev-libs/libcdio:0= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3:0= )
-		libav? ( media-video/libav:0= ) )
-	nls? ( virtual/libintl:0= )
-	openal? ( media-libs/openal:0= )
-	opengl? ( virtual/opengl:0=
-		x11-libs/libXxf86vm:0= )
-	pulseaudio? ( media-sound/pulseaudio:0= )
-	sdl? ( media-libs/libsdl:0=[sound] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/intltool
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext:0 )
-	x86? ( dev-lang/nasm )
-"
-
-# it's only the .po file check that fails :)
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-sdl2.patch
-	"${FILESDIR}"/${P}-zlib-uncompress2.patch
-	"${FILESDIR}"/${P}-ffmpeg3.patch
-)
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local sound_backend
-
-	if use alsa; then
-		sound_backend=alsa
-	elif use oss; then
-		sound_backend=oss
-	elif use pulseaudio; then
-		sound_backend=pulseaudio
-	elif use sdl; then
-		sound_backend=sdl
-	elif use openal; then
-		sound_backend=openal
-	else
-		sound_backend=null
-	fi
-
-	local myconf=(
-		$(use_enable nls)
-		$(use_enable cdio libcdio)
-		$(use_enable opengl)
-		$(use_enable ffmpeg ccdda)
-		--enable-sound=${sound_backend}
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	dodoc doc/{keys,tweaks}.txt
-}
-
-pkg_postinst() {
-	local vr
-	for vr in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.94-r1 ${vr}; then
-			ewarn "Starting with pcsxr-1.9.94-r1, the plugin install path has changed."
-			ewarn "In order for pcsxr to find plugins, you will need to remove stale"
-			ewarn "symlinks from ~/.pcsxr/plugins. You can do this using the following"
-			ewarn "command (as your regular user):"
-			ewarn
-			ewarn " $ find ~/.pcsxr/plugins/ -type l -delete"
-		fi
-	done
-}
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 9b0ce101e849..a15473db70b0 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -2,8 +2,8 @@ AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7ea
 AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1
 AUX snes9x-1.58-without-screenshot_build_fix.patch 846 BLAKE2B a8afca89a9d5a85df688610e2e136f1e47c1558f3be1a02585f47c075587993b68fbc29de987b7e791517a4584aa9373c4985dbdaed979e0688ae6cb3e5c9d58 SHA512 4cb91935d39766c091fdc30a5eb7b01eb60e29ea365da75968b5302d1f44be6992f46c04ba91af412edc787ddd0738ac8455d7127fbfe79ba7782abc423bab32
 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
-DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
 DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
-EBUILD snes9x-1.58.ebuild 2794 BLAKE2B 52f8fb2b4963726d48342aa4a187269f26136d75efd171ae42293af904652933cfe0f4d1972c5f7b57f81a8a7b3ddaf5ed7a15aa06cad0a024d709230b518d1e SHA512 a7bc93e81e219f345238ca537fca56e84363cbd8afbd6c4918b4eea8b2bf52dc45cfd25389c1f2e7790a99b84c5e5adfb481c0937049b35a1653138b0f6267a7
+DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
 EBUILD snes9x-1.59.2.ebuild 2723 BLAKE2B e365643b7c13bae7577eeda034963a946e3dd78153696f09f95503d0c758115294f4295d797b6b7be2950c0e584afcb3aeaea57d55683f7988ca286aa7b70f96 SHA512 9a474aba0c8fd071f090bec4694ebc036733b6831cfb01e35a9b1fffea049340fe2cc0b1fe840dae93df03b3740faf65ac000ec58d71adfd465d11767cf917d7
+EBUILD snes9x-1.60.ebuild 2723 BLAKE2B 76a612ec32ebf70698c2d6996d58e05e1191c1505b6bdca6c047aef5d5b7a2781644d9e2ab1fa00f2baa071471f61c10029523e5d13ebc7707d6e07ada68ea13 SHA512 7ee4da1e9d2ce81a419490802d375c39d53d86cd05239bc6815a8e36924d9905bc749080e400b0d0370dbff8f48477c7b182f946e8cd9310c1de220b89e2e67c
 MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
diff --git a/games-emulation/snes9x/snes9x-1.58.ebuild b/games-emulation/snes9x/snes9x-1.60.ebuild
index c933203fc0d1..1460433e5d76 100644
--- a/games-emulation/snes9x/snes9x-1.58.ebuild
+++ b/games-emulation/snes9x/snes9x-1.60.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+inherit autotools flag-o-matic meson xdg
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug gtk multilib netplay nls opengl oss png pulseaudio portaudio wayland xinerama +xv"
+IUSE="alsa debug gtk multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
 RESTRICT="bindist"
 
 RDEPEND="
@@ -38,27 +38,24 @@ RDEPEND="
 	)
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( dev-util/intltool )"
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${P}/unix"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.58-build-system.patch
-	"${FILESDIR}"/${P}-without-screenshot_build_fix.patch
+	"${FILESDIR}"/${PN}-1.59-build-system.patch
 )
 
 src_prepare() {
-	cd "${WORKDIR}"/${P} || die
+	cd "${WORKDIR}/${P}" || die
 	rm -r unzip || die
 	default
 	cd unix || die
 	eautoreconf
-	if use gtk; then
-		cd ../gtk || die
-		eautoreconf
+	if use gtk ; then
+		export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
 	fi
 }
 
@@ -79,29 +76,28 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 
 	if use gtk; then
-		cd ../gtk || die
-		myeconfargs=(
-			--with-gtk3
-			--with-zlib
-			--with-system-zip
-			--without-gtk2
-			$(use_enable nls)
-			$(use_with opengl)
-			$(use_with xv)
-			$(use_with alsa)
-			$(use_with oss)
-			$(use_with pulseaudio)
-			$(use_with portaudio)
-			$(use_with png screenshot)
-			$(use_with wayland)
+		local emesonargs=(
+			-Dalsa="$(usex alsa true false)"
+			-Ddebugger="$(usex debug true false)"
+			-Dgtk2=false
+			-Dgtk3=true
+			-Dopengl="$(usex opengl true false)"
+			-Doss="$(usex oss true false)"
+			-Dportaudio="$(usex portaudio true false)"
+			-Dpulseaudio="$(usex pulseaudio true false)"
+			-Dscreenshot="$(usex png true false)"
+			-Dsystem-zip=true
+			-Dxv="$(usex xv true false)"
+			-Dzlib=true
+			-Dwayland="$(usex wayland true false)"
 		)
-		econf "${myeconfargs[@]}"
+		meson_src_configure
 	fi
 }
 
 src_compile() {
 	emake
-	use gtk && emake -C ../gtk
+	use gtk && meson_src_compile
 }
 
 src_install() {
@@ -110,8 +106,8 @@ src_install() {
 	dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
 	dodoc snes9x.conf.default
 
-	if use gtk; then
-		emake -C ../gtk DESTDIR="${D}" install
+	if use gtk ; then
+		meson_src_install
 		dodoc ../gtk/AUTHORS
 	fi
 
@@ -120,19 +116,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	use gtk && gnome2_icon_savelist
+	use gtk && xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gtk && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gtk && xdg_pkg_postrm
 }