gentoo resync : 04.01.2022

14 files changed, 307 insertions, 209 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c072587279fd..392224c9fbc3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index a6029c795c77..ea0517af206d 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,7 +1,10 @@
+AUX dosbox-staging-0.78.0-fix_tests.patch 1289 BLAKE2B 2ba0b7a146948f3fa70a4f0bba86327c67cd3d8cdddd8d6d988f01ef7b6fce826d99eea42efe614a78f884075501ed991b2e6fd26708fcf17a06eaf943ff8b6b SHA512 c4a62b2f68cf26a64843c316ffdc702ecd1813fd38a8cf318b2c1a4762ac278d0b4fd3ad64f8e7a859e35ac4842a47d73d73594675d603649038b2e6610972f8
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142 SHA512 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
 DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6 SHA512 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff SHA512 fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
+DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40 SHA512 e56b4735f1a741f2c160646f205776e2407ab3333d4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746
 EBUILD dosbox-staging-0.76.0.ebuild 1431 BLAKE2B d6fefe9c171bd48de4246e239d95ebc78bbc02cf1aa138712cc3a2ed76fa9a5a5a181770e8d3f2173079770ef56b4adb83f8843d2fbfcfa6996c8806936912c6 SHA512 3fa322c2f91c97d0f86befc97c93d0e4dd4dcdba56055a97a8dd0fe85907e7319353cf85790dfc790fe811a9ba8990eaece8d86040255cf55f99ea8b502b5ea5
 EBUILD dosbox-staging-0.77.0-r1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5
 EBUILD dosbox-staging-0.77.1.ebuild 1727 BLAKE2B f1ddc2fef8fb1afc6c02c3013270a45c618630796b349275e40ef24a8084609f897bd0dfc1a8ac2d6684d740e23eba27f3dfbedce205592e0191d32660d06254 SHA512 aab080cf5293e8db0c344b8b713eac51a5525e3b0fffafc0a0f802388e315e0c0a39a902f0037ecc726b590e961587ad9051f5a82c784e9b2d06a4a54e1df6e1
-MISC metadata.xml 798 BLAKE2B e8e6368cfb116669c3359a665d5709c9bdc0eb778275599946e208a16909901ed23d852e7d45feaf6fd3897f786e1400d7eb46b19dcca45886df4872055b4577 SHA512 f513b215767cb39d8b92e8ece09110075d3c81ecb5d293b225e85d3e9368c2f10075435db6e31c758db89635ef9d99008d15430a0f7b891c0ae9278b7d97475e
+EBUILD dosbox-staging-0.78.0.ebuild 1842 BLAKE2B 243e1725fce94f68c2da2edfad0aed9ecd3ad99ab223ced92a407689f6fdb05225052347a153ed7eba25eeda6377cd4e338eb8128f075a0d0933b902ca19224a SHA512 49704bb349db19852dcbd1726c5fb09b9bb5a08768344cfe12a50d70da915c6ae64a8208e93bde551924d8a648e9d847c2c49149e43b7ab12707d71cbf93048d
+MISC metadata.xml 887 BLAKE2B b7d3d47e105c5217c97f6bca8088e39525dcca272b1d24da98df099b8cc7f9d380264b2ba703648dc05e4738f6c12b6617b376b6457da8573f585e7f5e250b61 SHA512 e7d147a2837d74775439a6e3b96f01e021f96fa141614802e5dd8d52670208b733956ee6e9694c15d86c4fc79546712972f3511efc4966aa1dab1060184d1c62
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
new file mode 100644
index 000000000000..ec44d977dad6
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	debug? ( sys-libs/ncurses:0= )
+	fluidsynth? (
+		media-sound/fluid-soundfont
+		media-sound/fluidsynth
+	)
+	mt-32? ( media-libs/munt-mt32emu )
+	network? ( media-libs/sdl2-net )
+	opengl? ( virtual/opengl )
+	slirp? ( net-libs/libslirp )
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl?,video,X]
+	media-libs/opusfile
+	sys-libs/zlib
+	!games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+PATCHES=( "${FILESDIR}"/${P}-fix_tests.patch )
+
+src_prepare() {
+	default
+
+	# We do not have default.sf2, use actual name from fluid-soundfont
+	sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+		-i src/midi/midi_fluidsynth.cpp || die
+
+	# Disable license and docs install (handled by ebuild)
+	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+
+	# Test failing on some platforms, bug #817908
+	# https://github.com/dosbox-staging/dosbox-staging/issues/1230
+	sed -i 's/.*soft_limit.*//' tests/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use alsa use_alsa)
+		$(meson_use debug)
+		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+		$(meson_use fluidsynth use_fluidsynth)
+		$(meson_use mt-32 use_mt32emu)
+		$(meson_use network use_sdl2_net)
+		$(meson_use opengl use_opengl)
+		$(meson_use slirp use_slirp)
+		$(meson_feature test unit_tests)
+	)
+	meson_src_configure
+}
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch
new file mode 100644
index 000000000000..d75aad0275ff
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch
@@ -0,0 +1,31 @@
+From 4499e4566d2e488be1c0e0a20328b13652ed14cb Mon Sep 17 00:00:00 2001
+From: kcgen <kcgen@users.noreply.github.com>
+Date: Sat, 1 Jan 2022 07:48:27 -0800
+Subject: [PATCH] Remove the project's main to prevent masking gmock's main
+ (#1476)
+
+clang/llvm ensure gmock's main() function always overrides the main
+function coming from the dosbox library, however sometimes with
+gcc/ld, gmock's main() doesn't take precedent and instead dosbox's
+main is run.
+
+This fixes an issue reported on Fedora and Gentoo where unit tests
+were popping up SDL's graphical window, and then either timing our
+failing.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d885da1b9..59f677b59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -444,7 +444,7 @@ executable('dosbox', dosbox_sources,
+            include_directories : incdir,
+            install : true)
+ # create a library so we can test things inside DOSBOX dep path
+-libdosbox = static_library('dosbox', ['src/main.cpp', 'src/dosbox.cpp', version_file],
++libdosbox = static_library('dosbox', ['src/dosbox.cpp', version_file],
+                         include_directories : incdir,
+                         dependencies : [atomic_dep,
+                                         threads_dep,
diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml
index 639809d4af9f..f4c7e89956af 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="mt-32">use <pkg>media-libs/munt-mt32emu</pkg> for MT-32 emulation</flag>
 		<flag name="network">Enable networking features (modem, ipx)</flag>
 		<flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag>
+		<flag name="slirp">Enable Ethernet emulation using <pkg>net-libs/libslirp</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dosbox-staging/dosbox-staging</remote-id>
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index e9c2ead7e381..a74e59277d54 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,4 +1,7 @@
 AUX higan-116_pre20210404-makefile.patch 2657 BLAKE2B d74b58ffedff5d4c1345bbbd0023dbabc162ff305fd39bf77a33b47dc6002f8fe3ad1d729bd5bcaa67dc6a57a4e6dd5cdce298bb6121396b0d779aa98845717b SHA512 c876acb714658cb1ba6fca9c359b9f030f5e15035bcf35697276ba5a3b68dd6098784b5e2eacc5bf7e082922d748eb526784c88139b24a099340531b34e3f152
+AUX higan-116_pre20210818-paths.patch 1413 BLAKE2B 9eb598b02a90d2e1e54455ad904b563929be754b20b788044f404f26c54debcfc16761c67f0abe4848aa705843ce77521db11a278e95dc40105c2f3672e134b5 SHA512 107957dc1b04958415e26e126966e1966d08631383dbefeff6245c6da59de67c00a229447a6befa2056878a67bc85f96e0f5b6aaf5aee4826411240c47a196be
 DIST higan-116_pre20210404.tar.gz 9130899 BLAKE2B bb9830901d7014f9d442f3a3bd9bd82ad791d2ba62a3264cfc187e5d7498a5ec6eae1fff6509f5206d9a21294e2a3ef710fbed5fac3626ecc88c4156bd50f289 SHA512 8ee40d8b9867fe767d5321dc4df3e73039fa39b7ecad2eddb58c3114bcf42b1b2074396ae5c4783ca060057aeb4bca7110101cc44d9608fe7c4d5f561b3f40a5
+DIST higan-116_pre20210818.tar.gz 9131284 BLAKE2B 4d3a514b9b8ec46353066b7257814c42024bff86c462b7a121aad5b5d1969d21cd7a96097e7d9d89d35e7a7f66a14c11a35cd77be05e73eca96caa3990e1c9b5 SHA512 d218feab3a3a39cd58fd2a727320ac88a4f006aa987c26860463f577039a9124b93119ee162f7d120f3bb4c23974eec53c7a0850c6e5743a8fdc8e48d108125d
 EBUILD higan-116_pre20210404.ebuild 2329 BLAKE2B 860b44b05c893addafb88ad3622067736924936aee4d9abb583f7a06014540e33a589004c1d5aa6ce708b0d39e1a373e87307b346650d5df41e69f6752c0f7d0 SHA512 6a76a5124d4fe6703abdd859c5a53c5cdf7ea16aca56e0aadc0874ec5c528598c7e2a8de7635c8a38a708aea518de0262001cc388b3c44fbb7cde261650288b4
+EBUILD higan-116_pre20210818.ebuild 3025 BLAKE2B ed9fb7a299d9490076b2e51bd399ecb6cad481f2edb7e085b0f6be52a8b77ec92e448c07c7cf57528e36e691ad63318216e610afd55bf22b07c6d32b6e6b02f5 SHA512 0f4fda1db900ea1434a8fc9a32f62fa10bfb05d6a1bc3433c48f8c596e168e01c54093a464599b3522f01c0425222d1994c6717217837c7836abe3b236bf477e
 MISC metadata.xml 488 BLAKE2B cadd5790504bc0ba9b4c182741dbba75fed245452b8436187415454e1cede5cd2abe672c780520576d5e81eea1eaa2c84a33ce2cf4891086acdcf60583c3d578 SHA512 ea768f4b82c19039dbd2891b6710dab6f3037665faf20d62c1a4a9ddb4219ada1c43edf13de2608a4606989d64712201c9f7393d2f42a2918385d306985e6d2c
diff --git a/games-emulation/higan/files/higan-116_pre20210818-paths.patch b/games-emulation/higan/files/higan-116_pre20210818-paths.patch
new file mode 100644
index 000000000000..0652b164cfd9
--- /dev/null
+++ b/games-emulation/higan/files/higan-116_pre20210818-paths.patch
@@ -0,0 +1,44 @@
+Based on patch from Arch additionally using system's Shaders/
+
+Resulting paths:
+/usr/share/higan/{Database,Firmware,Shaders,Templates}
+~/higan/ -> ~/.local/share/higan/Systems
+
+Templates+Systems can be changed in ~/.config/higan/paths.bml and
+does not disrupt existing configurations. Shaders will use default
+~/.config/higan/Shaders over system's if it exists.
+
+https://bugs.gentoo.org/828108
+--- a/higan-ui/higan-ui.cpp
++++ b/higan-ui/higan-ui.cpp
+@@ -44,9 +44,8 @@
+   }
+   if(!directory::exists(Path::templates)) {
+-    Path::templates = {Path::userData(), "higan/"};
+-    directory::create(Path::templates);
++    Path::templates = {Path::sharedData(), "higan/Templates/"};
+   }
+   if(!directory::exists(Path::data)) {
+-    Path::data = {Path::user(), "higan/"};
++    Path::data = {Path::userData(), "higan/Systems/"};
+     directory::create(Path::data);
+   }
+--- a/higan-ui/menus/settings.cpp
++++ b/higan-ui/menus/settings.cpp
+@@ -78,4 +78,6 @@
+ 
+   string location{Path::settings, "Shaders/"};
++  if(!directory::exists(location))
++    location = string{Path::sharedData(), "higan/Shaders/"};
+ 
+   if(settings.video.driver == "OpenGL 3.2") {
+--- a/icarus/icarus.cpp
++++ b/icarus/icarus.cpp
+@@ -9,6 +9,5 @@
+   if(inode::exists(location)) return location;
+ 
+-  directory::create({Path::userData(), "icarus/"});
+-  return {Path::userData(), "icarus/", name};
++  return {Path::sharedData(), "higan/", name};
+ }
+ 
diff --git a/games-emulation/higan/higan-116_pre20210818.ebuild b/games-emulation/higan/higan-116_pre20210818.ebuild
new file mode 100644
index 000000000000..e484fdff7aa0
--- /dev/null
+++ b/games-emulation/higan/higan-116_pre20210818.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+HIGAN_COMMIT="9bf1b3314b2bcc73cbc11d344b369c31562aff10"
+
+DESCRIPTION="Multi-system emulator focused on accuracy, preservation, and configurability"
+HOMEPAGE="https://github.com/higan-emu/higan"
+SRC_URI="https://github.com/higan-emu/higan/archive/${HIGAN_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HIGAN_COMMIT}"
+
+LICENSE="GPL-3+ ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa ao +gtk openal +opengl oss +pulseaudio +sdl udev xv"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	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/libudev:= )
+	xv? ( x11-libs/libXv )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0=
+		x11-libs/pango
+	)
+	!gtk? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# insane build system, reinvents every built-in rule
+	"${FILESDIR}"/${PN}-116_pre20210404-makefile.patch
+	"${FILESDIR}"/${PN}-116_pre20210818-paths.patch
+)
+
+src_prepare() {
+	default
+
+	use !prefix || sed -i "s|/usr/share|${EPREFIX}&|" nall/path.hpp || die
+}
+
+src_compile() {
+	local makeopts=(
+		platform=linux
+		compiler="$(tc-getCXX)"
+		hiro=$(usex gtk gtk3 qt5)
+	)
+
+	local drivers=(
+		video.xshm
+		input.xlib
+		$(usev alsa audio.alsa)
+		$(usev ao audio.ao)
+		$(usev openal audio.openal)
+		$(usev opengl "video.glx video.glx2")
+		$(usev oss audio.oss)
+		$(usev pulseaudio "audio.pulseaudio audio.pulseaudiosimple")
+		$(usev sdl input.sdl)
+		$(usev udev input.udev)
+		$(usev xv video.xvideo)
+	)
+
+	local coreopts=(
+		cores="cv fc gb gba md ms msx ngp pce sfc sg ws"
+		ruby="${drivers[*]}"
+		build=performance
+		local=false
+	)
+
+	emake "${makeopts[@]}" "${coreopts[@]}" -C higan-ui
+
+	emake "${makeopts[@]}" -C icarus
+}
+
+src_install() {
+	dobin higan-ui/out/higan
+	domenu higan-ui/resource/higan.desktop
+	doicon higan-ui/resource/higan.png
+
+	dobin icarus/out/icarus
+	domenu icarus/resource/icarus.desktop
+	doicon icarus/resource/icarus.svg
+
+	insinto /usr/share/higan
+	doins -r icarus/{Database,Firmware}
+	use opengl && doins -r extras/Shaders
+
+	insinto /usr/share/higan/Templates
+	doins -r higan/System/.
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 116_pre20210818; then
+		elog "On new installs, higan now uses ~/.local/share/higan/Systems/ rather than"
+		elog "~/higan/, and reads Templates from ${EROOT}/usr/share/higan/ on Gentoo."
+		elog "Will need to edit/delete ~/.config/higan/paths.bml for this to take effect."
+		elog
+		elog "Additionally, system's shaders will be used if ~/.config/higan/Shaders"
+		elog "does not exist, and icarus now uses the system's Database+Firmware files."
+	fi
+}
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 66ed95543fb8..67f919db52fd 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,6 +1,3 @@
-AUX openmsx-16.0-libsdl-joystick-fix.patch 2101 BLAKE2B b2381fe41d014106f87a11ccc8f5f301bf033d4ff281a11280b4b8459cf62f81c29a2d07220466ab7cb59005f14157857f3ff566e1f00ddfc104ba68b199dfd5 SHA512 f2aa3b1e69879db9a315e6485db67382228827caa2d362f9f1843a76741d2bb6f909ed05664d88608c01910914e3c40d2e5600a78b276111e242f51145e3c9cb
-DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
 DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
-EBUILD openmsx-16.0-r1.ebuild 2940 BLAKE2B 63a22b96330eb87055d2910d910aa5ee31f30354a3aa87ad290572975b77401613eb18e9986ca3e2456fb4c15b0ad2922215968eb0c65fdf7767fe64742068ce SHA512 46be0450204bb95639a0822f6bf90824c8b728ceae2c67e79731da1b52f6a82ca0c62fe8fe41ef3a0dcf4bc71535e54c46d09976d90d12d18efe14713814dab6
 EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f
diff --git a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
deleted file mode 100644
index ff4e4c31e0cd..000000000000
--- a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From eb5ddae80bdc6793de42ee67dd72e2da9d632ba8 Mon Sep 17 00:00:00 2001
-From: Maarten ter Huurne <maarten@treewalker.org>
-Date: Sat, 23 Jan 2021 03:25:38 +0100
-Subject: [PATCH] Fix compile errors and warnings when SDL_JOYSTICK_DISABLED is
- defined
-
-If there is no base class, it's impossible to override the destructor.
-
-There were warning suppressors for 3 out of 5 arguments that are unused
-when SDL_JOYSTICK_DISABLED is defined; I added the othe two.
----
- src/input/JoyMega.hh  | 6 +++++-
- src/input/Joystick.cc | 2 ++
- src/input/Joystick.hh | 8 ++++++--
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/input/JoyMega.hh b/src/input/JoyMega.hh
-index 8422bcd2a..05371e27d 100644
---- a/src/input/JoyMega.hh
-+++ b/src/input/JoyMega.hh
-@@ -25,7 +25,11 @@ public:
- 	JoyMega(MSXEventDistributor& eventDistributor,
- 	         StateChangeDistributor& stateChangeDistributor,
- 	         SDL_Joystick* joystick);
--	~JoyMega() override;
-+	~JoyMega()
-+#ifndef SDL_JOYSTICK_DISABLED
-+		override
-+#endif
-+		;
- 
- #ifndef SDL_JOYSTICK_DISABLED
- 	// Pluggable
-diff --git a/src/input/Joystick.cc b/src/input/Joystick.cc
-index 04b4826cd..90b344c42 100644
---- a/src/input/Joystick.cc
-+++ b/src/input/Joystick.cc
-@@ -32,6 +32,8 @@ void Joystick::registerAll(MSXEventDistributor& eventDistributor,
- #ifdef SDL_JOYSTICK_DISABLED
- 	(void)eventDistributor;
- 	(void)stateChangeDistributor;
-+	(void)commandController;
-+	(void)globalSettings;
- 	(void)controller;
- #else
- 	for (auto i : xrange(SDL_NumJoysticks())) {
-diff --git a/src/input/Joystick.hh b/src/input/Joystick.hh
-index 18dd3c1c0..6a0f38d9d 100644
---- a/src/input/Joystick.hh
-+++ b/src/input/Joystick.hh
-@@ -38,9 +38,13 @@ public:
- 	Joystick(MSXEventDistributor& eventDistributor,
- 	         StateChangeDistributor& stateChangeDistributor,
- 	         CommandController& commandController,
--		 GlobalSettings& globalSettings,
-+	         GlobalSettings& globalSettings,
- 	         SDL_Joystick* joystick);
--	~Joystick() override;
-+	~Joystick()
-+#ifndef SDL_JOYSTICK_DISABLED
-+		override
-+#endif
-+		;
- 
- #ifndef SDL_JOYSTICK_DISABLED
- 	// Pluggable
diff --git a/games-emulation/openmsx/openmsx-16.0-r1.ebuild b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
deleted file mode 100644
index e321fddfea00..000000000000
--- a/games-emulation/openmsx/openmsx-16.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="https://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+joystick"
-
-RDEPEND="dev-lang/tcl:0=
-	media-libs/alsa-lib
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick=,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/sdl2-ttf
-	>=media-libs/glew-1.3.2:0=
-	sys-libs/zlib
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${P}-libsdl-joystick-fix.patch" )
-
-DOC_CONTENTS="
-If you want to if you want to emulate real MSX systems and not
-only the free C-BIOS machines, put the system ROMs in one of
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^LDFLAGS:=/d' \
-		-e '/LINK_FLAGS_PREFIX/d' \
-		-e '/LINK_FLAGS+=/s/-s//' \
-		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
-		build/main.mk \
-		|| die
-	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
-	sed -i -e 's/GPL.txt//' doc/node.mk || die
-
-	# Build system only configured to use bundled version - but not from the
-	# directory it's distributed in
-	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
-}
-
-src_configure() {
-	tc-export CXX
-
-	# Doesn't compile without this, and build system doesn't consistently add
-	# it properly for all compilers
-	append-cxxflags '-std=c++17'
-
-	default
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
-		V=1
-}
-
-src_test() {
-	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
-	# build is stored in a directory of the pattern
-	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
-	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
-	# binary are in each of these directories under their `bin` directories.
-	emake \
-		V=1 \
-		CXXFLAGS="${CXXFLAGS}" \
-		OPENMSX_FLAVOUR=unittest
-
-	# There will only ever be one *-unittest directory
-	"${S}"/derived/*-unittest/bin/openmsx || die
-}
-
-src_install() {
-	# To guarantee installing the proper binary in case tests were built,
-	# specify the default OPENMSX_FLAVOUR
-	emake \
-		V=1 \
-		INSTALL_BINARY_DIR="${ED}/usr/bin" \
-		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
-		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		OPENMSX_FLAVOUR=opt \
-		install
-
-	einstalldocs
-	readme.gentoo_create_doc
-
-	for i in 16 32 48 64 128 256 ; do
-		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
-	done
-	make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 216401050280..a27006a860df 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 2837 BLAKE2B 81174d609dd0c17ba0ac3a144c9bb2835dcc19f7065908dd6bf8de1b95bcadec7776bd85ea3efce6e01a104778e1168d4079575c907de052999b99278b647b1d SHA512 304662644fc9f70bcd1c464e63cc828f0323f1f748801d48d5185619c5897e0c84d849398b40a28369923d94cb28ca6aea0a9f9706cea2afba4af66187c88025
-EBUILD pcsx2-1.6.0-r2.ebuild 2810 BLAKE2B e24f4949ec6a0276c30582c94622c7f3cadd4102e6bc8aca391a3e9fb42450a21fa6c1b5a01778ac0fa41aa0fb130a35c367e45f7201c7d069644ee15edc58ed SHA512 5be56aa2fd4eb7a2bb883ae9ae8e1e16003211b77bbfebd911b1ea2d2cf51360ea41f320c7eef1d1c5d96dc68a5d49519ed1bcb31149344403529bd6577877f4
-EBUILD pcsx2-9999.ebuild 2274 BLAKE2B c18c62036f43f7a3d2a9ed689cd359e0b6c33957ee971df673b27719b3177893bea3388c2fc472af28c554e00aa17299f179bde7163fa39a7390be6ce09a20b5 SHA512 042b6203466b52ea6c0ac86bfe55e5bcda842fa2135b65ff10cfe715c1dc26de5d67e75bd69ccda37f3c5258168bf677a626c7848b97215bbcd51388baffd6f3
+EBUILD pcsx2-1.6.0-r2.ebuild 2809 BLAKE2B 242f23326abcd7fd989c4788ea29470a05c91133ac96967db1ac3d2b83c4b63b9ac200fb47fa1b37980462a0d480c026cad461235dd8299f7d8ad012a9439c92 SHA512 9beb5958247b61c11f61f3ba3edf4565e40c781acb6f01cd7045889a2573b4b88637cd970f069e15f1913685973934889a852314da49e3e89e4851afee5c9f8c
+EBUILD pcsx2-9999.ebuild 2607 BLAKE2B 3961c43af3ea246096a127469f48de24125ee8801158e881cd6c01e6ae4b7da7379319455529b2582a91ff7a46a857e0d8ef4e9de7569ff33916e8ff3114d9d8 SHA512 ca2e4d652e1477669bed7c07ba554b12560e8ab2251536f5ca4e30cab7413515fce16a38aa1875e2945d07c8f7c641415ec1c0eb55a208f653d4a708f9d311fd
 MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index a358ecfb9dae..36422246430f 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6c56bf44c0de..2df1c8c2ebc9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,43 +9,49 @@ 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=( 3rdparty/libchdr/libchdr )
+EGIT_SUBMODULES=()
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="pulseaudio test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/bzip2
 	app-arch/xz-utils
-	dev-cpp/yaml-cpp:=
+	dev-cpp/rapidyaml:=
+	dev-libs/glib:2
 	dev-libs/libaio
+	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
+	media-libs/cubeb
+	media-libs/freetype
+	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
 	media-libs/libsdl2[haptic,joystick,sound]
-	media-libs/libsoundtouch
-	media-libs/portaudio
+	media-libs/libsoundtouch:=
 	net-libs/libpcap
 	sys-libs/zlib
-	virtual/libudev
-	virtual/opengl
+	virtual/libudev:=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
 )
 
 pkg_setup() {
@@ -58,6 +64,19 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	cmake_src_prepare
+
+	# unbundle, use sed over patch for less chances to break -9999
+	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
+		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-i cmake/SearchForStuff.cmake || die
+	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
+
+	# pulseaudio is only used for usb-mic, not audio output
+	use pulseaudio || > cmake/FindPulseAudio.cmake || die
+}
+
 src_configure() {
 	# Build with ld.gold fails
 	# https://github.com/PCSX2/pcsx2/issues/1671
@@ -73,7 +92,6 @@ src_configure() {
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS="$(usex test)"
-		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
@@ -87,12 +105,3 @@ src_configure() {
 	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
-}