Updating liguros repo21.1.2

12 files changed, 154 insertions, 295 deletions

diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b63534d242d3..14b329e33b85 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaud
 
 RDEPEND="
 	dev-libs/hidapi:0=
-	dev-libs/libfmt:0=
+	>=dev-libs/libfmt-7.1:0=
 	dev-libs/lzo:2=
 	dev-libs/pugixml:0=
 	media-libs/libpng:0=
diff --git a/games-emulation/fakenes/Manifest b/games-emulation/fakenes/Manifest
deleted file mode 100644
index 9e99f68878e0..000000000000
--- a/games-emulation/fakenes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fakenes-0.5.8.tar.bz2 274503 BLAKE2B 64b410052e54c0cd1b474f5bacce220f39455c0de9024582cfc98ea307900b771428eeb9cb4e83e0cd72b0a221d10856f23f1c34b3058050a7dbc81b03e88c07 SHA512 2a22c51cf7171661a92584e083c3dfd69d009b586c22f8b5a4b4022065309ae4d6370a81997c035a9e19ff225e87d92e1b572b313585f2e05776cbf7c1c971aa
diff --git a/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild b/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
deleted file mode 100644
index 397702286d8a..000000000000
--- a/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic toolchain-funcs gnome2-utils
-
-DESCRIPTION="Portable, Open Source NES emulator which is written mostly in C"
-HOMEPAGE="https://sourceforge.net/projects/fakenes/"
-SRC_URI="mirror://sourceforge/fakenes/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openal opengl zlib"
-
-RDEPEND="
-	>=media-libs/allegro-4.4.1.1:0[opengl?]
-	dev-games/hawknl
-	openal? (
-		media-libs/openal
-		media-libs/freealut
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:openal-config:pkg-config openal:" \
-		build/openal.cbd || die
-
-	sed -i \
-		-e "s:LIBAGL = agl:LIBAGL = alleggl:" \
-		build/alleggl.cbd || die
-	eapply "${FILESDIR}"/${P}-{underlink,zlib}.patch
-}
-
-src_compile() {
-	local myconf
-
-	append-ldflags -Wl,-z,noexecstack
-
-	echo "$(tc-getBUILD_CC) cbuild.c -o cbuild"
-	$(tc-getBUILD_CC) cbuild.c -o cbuild || die "cbuild build failed"
-
-	use openal || myconf="$myconf -openal"
-	use opengl || myconf="$myconf -alleggl"
-	use zlib   || myconf="$myconf -zlib"
-
-	LD="$(tc-getCC) ${CFLAGS}" ./cbuild ${myconf} --verbose || die "cbuild failed"
-}
-
-src_install() {
-	dobin fakenes
-	insinto "/usr/share/${PN}"
-	doins support/*
-
-	cd docs && HTML_DOCS="faq.html" einstalldocs && cd ..
-
-	newicon -s 32 support/icon-32x32.png ${PN}.png
-	make_desktop_entry ${PN} "FakeNES"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch b/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
deleted file mode 100644
index 48f37a5fd83d..000000000000
--- a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/build/hawknl.cbd.old	2011-06-22 17:28:16.733408930 +0200
-+++ b/build/hawknl.cbd	2011-06-22 17:28:29.217203187 +0200
-@@ -22,4 +22,4 @@
- 
- # --
- 
--LDFLAGS += ' -lNL'
-+LDFLAGS += ' -lNL -lm'
diff --git a/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch b/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch
deleted file mode 100644
index 15549051a6a5..000000000000
--- a/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur fakenes-0.5.8-old/src/include/unzip.h fakenes-0.5.8/src/include/unzip.h
---- fakenes-0.5.8-old/src/include/unzip.h	2012-08-22 20:51:45.310735240 +0200
-+++ fakenes-0.5.8/src/include/unzip.h	2012-08-22 20:56:40.737069700 +0200
-@@ -119,9 +119,9 @@
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
- 												 const char* fileName2,
--												 int iCaseSensitivity));
-+												 int iCaseSensitivity);
- /*
-    Compare two filename (fileName1,fileName2).
-    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-@@ -132,7 +132,7 @@
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen (const char *path);
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -143,24 +143,24 @@
- 	   of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose (unzFile file);
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
--					unz_global_info *pglobal_info));
-+extern int ZEXPORT unzGetGlobalInfo (unzFile file,
-+					unz_global_info *pglobal_info);
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-   No preparation of the structure is needed
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment (unzFile file,
- 										   char *szComment,
--					   uLong uSizeBuf));
-+					   uLong uSizeBuf);
- /*
-   Get the global comment string of the ZipFile, in the szComment buffer.
-   uSizeBuf is the size of the szComment buffer.
-@@ -171,22 +171,22 @@
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile (unzFile file);
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile (unzFile file);
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file, 
-+extern int ZEXPORT unzLocateFile (unzFile file, 
- 				     const char *szFileName,
--				     int iCaseSensitivity));
-+				     int iCaseSensitivity);
- /*
-   Try locate the file szFileName in the zipfile.
-   For the iCaseSensitivity signification, see unzStringFileNameCompare
-@@ -197,14 +197,14 @@
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
- 					     unz_file_info *pfile_info,
- 					     char *szFileName,
- 					     uLong fileNameBufferSize,
- 					     void *extraField,
- 					     uLong extraFieldBufferSize,
- 					     char *szComment,
--					     uLong commentBufferSize));
-+					     uLong commentBufferSize);
- /*
-   Get Info about the current file
-   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-@@ -223,22 +223,22 @@
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile (unzFile file);
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile (unzFile file);
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 												
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-+extern int ZEXPORT unzReadCurrentFile (unzFile file, 
- 					  voidp buf,
--					  unsigned len));
-+					  unsigned len);
- /*
-   Read bytes from the current file (opened by unzOpenCurrentFile)
-   buf contain buffer where data must be copied
-@@ -250,19 +250,19 @@
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell (unzFile file);
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof (unzFile file);
- /*
-   return 1 if the end of file was reached, 0 elsewhere 
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
- 											 voidp buf,
--											 unsigned len));
-+											 unsigned len);
- /*
-   Read extra field from the current file (opened by unzOpenCurrentFile)
-   This is the local-header version of the extra field (sometimes, there is
-diff -ur fakenes-0.5.8-old/src/unzip.c fakenes-0.5.8/src/unzip.c
---- fakenes-0.5.8-old/src/unzip.c	2012-08-22 20:51:45.300735366 +0200
-+++ fakenes-0.5.8/src/unzip.c	2012-08-22 20:57:42.596243769 +0200
-@@ -500,7 +500,7 @@
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
-@@ -509,7 +509,7 @@
-                                                   void *extraField,
- 												  uLong extraFieldBufferSize,
-                                                   char *szComment,
--												  uLong commentBufferSize));
-+												  uLong commentBufferSize);
- 
- local int unzlocal_GetCurrentFileInfoInternal (file,
-                                               pfile_info,
diff --git a/games-emulation/fceux/fceux-2.2.3-r100.ebuild b/games-emulation/fceux/fceux-2.2.3-r100.ebuild
index e83cfb164b32..cf4a19754384 100644
--- a/games-emulation/fceux/fceux-2.2.3-r100.ebuild
+++ b/games-emulation/fceux/fceux-2.2.3-r100.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit python-any-r1 desktop lua-single scons-utils toolchain-funcs
diff --git a/games-emulation/hatari/hatari-2.2.1-r1.ebuild b/games-emulation/hatari/hatari-2.2.1-r1.ebuild
index ead51fe8f160..1b22094dbc6b 100644
--- a/games-emulation/hatari/hatari-2.2.1-r1.ebuild
+++ b/games-emulation/hatari/hatari-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
index 7f4b51fdf8b1..09a2aafadb15 100644
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ b/games-emulation/higan/higan-106_p1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
-inherit desktop toolchain-funcs qmake-utils xdg-utils
+inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="A multi-system game emulator formerly known as bsnes"
 HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
new file mode 100644
index 000000000000..fd28218cd55d
--- /dev/null
+++ b/games-emulation/openmsx/Manifest
@@ -0,0 +1 @@
+DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
diff --git a/games-emulation/fakenes/metadata.xml b/games-emulation/openmsx/metadata.xml
index 0168423f9766..fff8b53dbab1 100644
--- a/games-emulation/fakenes/metadata.xml
+++ b/games-emulation/openmsx/metadata.xml
@@ -5,8 +5,16 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<maintainer type="person">
+			<email>jchelmert3@posteo.net</email>
+			<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+			<email>proxy-maint@gentoo.org</email>
+			<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">fakenes</remote-id>
+		<remote-id type="github">openmsx/openmsx</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/games-emulation/openmsx/openmsx-16.0.ebuild b/games-emulation/openmsx/openmsx-16.0.ebuild
new file mode 100644
index 000000000000..7d996cfb2dab
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-16.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2[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}"
+
+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/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 764020699ad5..0430a2481682 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake fcaps flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -13,33 +13,38 @@ EGIT_SUBMODULES=()
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	dev-libs/libfmt:=[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]
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-cpp/yaml-cpp:=
+	dev-libs/libaio
+	dev-libs/libfmt:=
+	dev-libs/libxml2:2
+	media-libs/alsa-lib
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	media-libs/libsdl2[haptic,joystick,sound]
+	media-libs/libsoundtouch
+	media-libs/portaudio
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libudev
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/wxGTK:3.0-gtk3[X]
 "
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
 	dev-cpp/sparsehash
 "
+BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
 	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
@@ -56,7 +61,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	multilib_toolchain_setup x86
 	# Build with ld.gold fails
 	# https://github.com/PCSX2/pcsx2/issues/1671
 	tc-ld-disable-gold
@@ -64,13 +68,6 @@ src_configure() {
 	# 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
@@ -82,11 +79,9 @@ src_configure() {
 		-DXDG_STD=TRUE
 
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DGTK3_API=TRUE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
+		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 	)
 
@@ -99,6 +94,6 @@ src_install() {
 	#  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"
+	QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2"
 	cmake_src_install
 }