6 files changed, 28 insertions, 59 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d957bc472b78..bb0e628cc30e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index a0b2631e78ab..d68baced5a32 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,4 +1,5 @@
+AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20210506.ebuild 4776 BLAKE2B c57e99a792364b830e2e341cdac7810a0fd1d3df80e46b04767be72f710010543c67d780194552df739eedbd553bd1382a89114be9c2b51843bee19d6809614e SHA512 9e3d28ac322cbe22059e579f280113c3c673f2dba81b8a059f3f54154c958eaa7850e61deb1fc6debf344b7c03fe12e0a7abfc9453a8e3ac6793964fc06cfb36
+EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B dadfd063ee1ab17262bd26eebb005843b3c5d09f3ff3370201eb4abb157fe8be024f09489baad716f7608fe235d355bd3205ddf46107c44e02cf9c4a8af151a8 SHA512 0dbbaa92a81d5f1367a768cc1588c1fa68248cf46043ecbbfb1e8b76bafb0e8ae8c2c0646952fe9e97d8e734ca5203676c92ad8abb24100131a10878d5c00e28
 EBUILD dolphin-9999.ebuild 4790 BLAKE2B 7265a71932941ab75c1836237b380be893563c532e45e414d6880cb8d2e446ff53718a3b961b6eb1a3a04724a9e058f2cf432854d608e0ff6a79e8f01b87b638 SHA512 535fcef911387f2ee2f271a0b42ca36065030640728d745b96cdaae2c4744eda626c171576459d29abb6ee7d0ece31d64417029f39cd166ce7197945973bc5bc
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
index 2a9debffb0ff..fd44c78fa9e2 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -71,6 +71,8 @@ BDEPEND="
 RDEPEND="${RDEPEND}
 	vulkan? ( media-libs/vulkan-loader )"
 
+PATCHES=("${FILESDIR}"/${P}-musl.patch)
+
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
new file mode 100644
index 000000000000..51570151c112
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/799281
+https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
+
+From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
+From: thyrc <thyrc@users.noreply.github.com>
+Date: Mon, 14 Jun 2021 10:18:34 +0200
+Subject: [PATCH] Fix includes for musl libc
+
+---
+ Source/Core/Core/MemoryWatcher.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp
+index 491ecd83150a..13843e2021ca 100644
+--- a/Source/Core/Core/MemoryWatcher.cpp
++++ b/Source/Core/Core/MemoryWatcher.cpp
+@@ -2,6 +2,7 @@
+ // Licensed under GPLv2+
+ // Refer to the license.txt file included.
+ 
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
+ #include <sstream>
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 1aa8f07b4120..55545ef510fd 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,8 +1,6 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
 AUX fceux-2.4.0-desktop.patch 447 BLAKE2B c9dc55fc34d990de50a1897cc9d1fe8abb5060336ae7b227ac1b07e28ef89d15e202be790ec3f8ff0f8280a64b81ae28c98ce1a22e54f57d93b2e3bb04a24b59 SHA512 00a2af80e5dc6f5ddff8e5fc28b94bc2e249798ec44f5f0b9ed414dc8438e1937058f9bab65cbb5b2c9c6dec85af1a51e58f68405dd758db4ec293efbdaf5398
 AUX fceux-2.4.0-no-git.patch 377 BLAKE2B 8b0be40a0eba5249f73942ea774dc0a37e73ac71fe1684d01551cd96876878d53219c0744ba0e6789c3663c56e58fccc2a2a450b03207219c76e2c10b04ea679 SHA512 6c67d5b823a2b70d6982d9f911edab65c0bcf2cf5faf1ae00004201aefe99d5feae4592204c2586eaa43affff6d05f2e6e3b9274add4713073c0e1cfb519465d
-DIST fceux-2.3.0.src.tar.gz 20779030 BLAKE2B 0d9a0e1f326bdcde4e360a03755c9d807a59e3f3826017e2923527f3ec214bec4c9737f98a8abc4e4971098d127ce8e95eb4142fa8d0bd71109190e6d2c93861 SHA512 46b53f0c4c790ae4f7d5e800adf81cce3c7ccf4b06f972d46e29c0170485e291516709a8c28b26c762d535453e280a6c6de935869c7674bb135c3dca2e266407
 DIST fceux-2.4.0.tar.gz 21807471 BLAKE2B 5b4d5e9438cfc974cb5ed1838b0845a1d125366fcfbe4ad72c1a5da7caed7bb763a7c66933933f61223abb9dc4c25f0ac7875a0751d122bf75e8567ca5de6cc4 SHA512 3f53db1091e28c91bff90a2d6c77bd3c022a7c20a29b07e6cb88e9ae4795ce7f9e68d15ac0f90721472f8c262907a2564e0be7adc8df2eb3ef252215717f30a0
-EBUILD fceux-2.3.0.ebuild 1378 BLAKE2B ce4eec0490df5b30a26ad8411bf8ca4c3687db5258c3b10f9660544bf922a15422deaa14be9d8b14f77e1308bd810976b9a8843bffe80c4e27ccd670101c980d SHA512 341834e56f3fa6a81c335364a0bc072bd1fe2b18a005b8a8996d62c263c208ead299de6ca69bd2724d5dd20a9b6671bd80c9f02bfddfb9266d16bfb748af04e7
 EBUILD fceux-2.4.0.ebuild 1195 BLAKE2B 21cebd383bfadd592292137a98cf8fe9f1c31365c8d6a4da8692210caae5f8e3866ec34e8644383ad8f5b4b55e6ec213a618069b9dc11d526111e3ce5213805a SHA512 012fc6975d98f402fbb109818caef9f655d56d993471c05f033c6edf41cc65a135cb5c5e09b1ffc9863354a4ae62bb3f8b8a7090b99ea90d7479dba32a56d7cf
 MISC metadata.xml 386 BLAKE2B 7d677f544e044d228273e576a0c61685180b3dbf785d58b1ec8c4b70b5c88ba741aba1e2c293a47e73a14834e83645e3455bb74207c67e6858bab5c9ab0dfb44 SHA512 376ec02a252d5915d5752f85924ce821d38e3da0f62ea18627bb00848aafd846e5c86cdc6cae824e08897b997ed90e1481ab1b831c23d0f4ceb5c5c9c0e35bfa
diff --git a/games-emulation/fceux/fceux-2.3.0.ebuild b/games-emulation/fceux/fceux-2.3.0.ebuild
deleted file mode 100644
index c62cda8abd5f..000000000000
--- a/games-emulation/fceux/fceux-2.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit cmake lua-single xdg
-
-DESCRIPTION="Portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="https://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5[-gles2-only]
-	dev-qt/qtwidgets:5
-	media-libs/libglvnd
-	media-libs/libsdl2[joystick,sound,threads,video]
-	sys-libs/zlib:=[minizip]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
-)
-DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove hardcoded paths and deprecated options from .desktop
-	sed -e '/^Exec=/s:=.*/:=:' \
-		-e '/^Icon=/s:=.*:=fceux1:' \
-		-e '/^OnlyShowIn=/d' \
-		-i fceux.desktop || die
-
-	# avoid QA notice if no git, returns empty strings either way
-	sed -i '/^GIT_/s:=.*:=:' scripts/genGitHdr.sh || die
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove unused/duplicate files
-	rm "${ED}"/usr/share/fceux/{lua5{1,.1}.dll,{fceux,taseditor}.chm} \
-		"${ED}"/usr/share/doc/${PF}/fceux{,-net-server}.6 \
-		"${ED}"/usr/share/man/man6/fceux-net-server.6 || die
-}