gentoo resync : 02.02.2022

13 files changed, 90 insertions, 139 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index a80f141fdec2..c2d422ecadbc 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 9c7a7a5fe9f5..09da8743f77b 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,8 +1,5 @@
-AUX desmume-0.9.11_p20210409-clang.patch 564 BLAKE2B 598a4f20ab5e8d7876ad4add3db0352b11af1dac44f8725b5f0b168c80f71fb5ace51c52ec975455c99994eefe03181e9c2e4c27ce335b3af735646695df90bc SHA512 839897604d7ce126d5f8d3eb2f5325532c57abb847479ecf54e19cb10d61c178a62a3624ff4a0e86589dec8568ea44129da8650cd7ab0697093d13452245c9ba
 AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07
 AUX desmume-0.9.11_p20210409-openal-automagic.patch 315 BLAKE2B cf203d506460deb88b6bc366d993e2376ebb6b2ac6d4e9c1d8eeda3aba0e0ab4ffe994c5855cf58babd2d25f86807289dbe48a37cace30732ecdc47363cdcbba SHA512 5d584a18595584ec8f23b74ceef5e3667d4e91a3b35def7cab715a9325a797f1b457dcff4dc804088aa047be49b0f828a28800a4713929ac4073bdf7a99b3b25
-DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B f8e582005555357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8 SHA512 1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
 DIST desmume-0.9.11_p20211119.tar.gz 13266678 BLAKE2B 0af12f9fd7f3448d4f18a61ec65f1a64926f402827bd9eb8af4a06766390dc626940c327e2bb0ff17d4d62eefe1171c4a836e98dbbbc34bf5d4e9e6d886189a0 SHA512 53553771b51741c2c553e47befec1eb90bdaa3c9ff239bdb301054dbaf5c483c768dac440fece797c9756f3c1490ad61da59b3b5728328b7f23aaa5e1de40625
-EBUILD desmume-0.9.11_p20210409-r1.ebuild 1166 BLAKE2B 393123312822a6862020fe1ed472f1b31f73024fc55331757f2a7e25542b8bc44918e85123e6e35188abd5ef08ada0298b329d1ec14a7b6a5842c54bbeeb7db2 SHA512 329b20e867bacb8edba5b22ed18e47266192b47b63dec8318e20ec6627ea6d7a8d6b3618354c13fa8a2793a5027b68aabbbf55a3c8d349fd669664348047933d
 EBUILD desmume-0.9.11_p20211119.ebuild 1240 BLAKE2B a0dae55b4757560002918fca5899a391b1ddfc548ed22aa8aed410343d3192c2e10ce03daddd4101021e399a1118a13d677e12ff2d709a9a84e03a8518199ba4 SHA512 4aa6d6e1f550c5c91391f2243bb3bffd71a278b4b33ccdef04d2d796a385c5e70af7413244f284ee35508ac51cafee26445a9be301536333710a5f72eee431fe
 MISC metadata.xml 634 BLAKE2B 91988d51bd4fc569685d68014de840113a5c046c33fe07f638af08d57c35cb92976a5004c23047e1fdcab2349426a70e2411ca654b46b639a335ee2a1d58a97f SHA512 28e671fab8e8aaef4d6573fe8d5cf490d1e1288d756240b27370eb58a631af96c2078a2fdbdc17320515b28c86cd90f3399299f7d00f9af6f1c91ce7312a8301
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
deleted file mode 100644
index 9cc9dd366242..000000000000
--- a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-MY_COMMIT="e8f619c44a23ebba06be1fb4442483d481477b81"
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="https://desmume.org/"
-SRC_URI="https://github.com/TASVideos/desmume/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdb +gui openal wifi"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/alsa-lib
-	media-libs/libsdl2[X,opengl,sound,video]
-	media-libs/libsoundtouch:=
-	net-libs/libpcap
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/agg
-	x11-libs/libX11
-	gui? ( x11-libs/gtk+:3 )
-	openal? ( media-libs/openal )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-gtk-cliopts.patch
-	"${FILESDIR}"/${P}-openal-automagic.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
-
-src_configure() {
-	local EMESON_SOURCE="${S}/${PN}/src/frontend/posix"
-	local emesonargs=(
-		$(meson_use gdb gdb-stub)
-		$(meson_use gui frontend-gtk)
-		$(meson_use openal)
-		$(meson_use wifi)
-	)
-	meson_src_configure
-}
diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
deleted file mode 100644
index 164cb5af4836..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with clang https://bugs.gentoo.org/739144
-
-Fixed upstream in: https://github.com/TASVideos/desmume/commit/92cb90f
---- a/desmume/src/texcache.cpp
-+++ b/desmume/src/texcache.cpp
-@@ -1165,8 +1165,8 @@ void NDSTextureUnpack4x4(const size_t sr
- 	
- 	for (size_t y = 0, d = 0; y < yTmpSize; y++)
- 	{
--		u32 tmpPos[4]={(y<<2)*sizeX,((y<<2)+1)*sizeX,
--			((y<<2)+2)*sizeX,((y<<2)+3)*sizeX};
-+		u32 tmpPos[4]={u32(y<<2)*sizeX,u32((y<<2)+1)*sizeX,
-+			u32((y<<2)+2)*sizeX,u32((y<<2)+3)*sizeX};
- 		for (size_t x = 0; x < xTmpSize; x++, d++)
- 		{
- 			if (d >= limit)
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index c293601fde99..12715ee18ce9 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.5.0.tar.gz 21992303 BLAKE2B 2c467a92eaa53c846fdfc7c32c68bec75fdf45d5166f5fa7f1141c48f159c8dc6619f40861373ccb83718dd2d0b857c630f5101a1d29c2699adf128d4711a929 SHA512 bbff55b6f3efda8918b7dab21582d93f8c2a6396bf64a93e33f2f5f6cd345f95bcde7b958f0a663967e47e83110733c4a732dbf538afb7dbecb3147bc3090f01
-DIST fceux-2.6.0.tar.gz 22157111 BLAKE2B b65b44d82eba7aa4b51096a6a60d83095d01ee0931fe01ed523882db67eaa5d741b42ddabdbafe57b58df68949886e6b54ce7530d09704eb2c12dc30c22c623d SHA512 e79b53883918b7fd325575b07729d4b703b004de0c1408e1f5b37b87182b835ba755409303ef208ab4068f7d5c8d6887f9d4b325cca86a55860c9261539178bc
-EBUILD fceux-2.5.0.ebuild 1550 BLAKE2B 9fcb095e65c133f2738faca6d2bfa762cf44ab1c0c78612a7715b0af08b16bd403c8ae7472ccf1c70414d037c5f9af6b28f8cf7be8b53eaf4faa75aff31b88e2 SHA512 b0a1b333dcb88189d78841a96b8a8d91e7016f124cdda12468c16902280b9f962c04f2bb07a7ea473c974634cd39798cc777298340473dbaf8ddc05148744351
-EBUILD fceux-2.6.0.ebuild 1550 BLAKE2B 26ad580addd456693cf339d0e6353138ce0702a0d8058b775109ed1ea613ca23bdb9fec13bd91fad2a098918d40f9e1a7288c0a48c846b31ed07f16762efebb9 SHA512 1fcebcb6226c7f2f04ced2c7f139a20dcf73c3a14cd4c34006484994f77cb8cf3733ad7302fe9d20872c92189bb5871c24c0d1c5dd479929c89a3b6bb20ba5c3
+DIST fceux-2.6.1.tar.gz 23326768 BLAKE2B 8a0907871af229cb8017845b444a8cc4ebe65dff0799483de488e984741fc89a885a9ecd421fef3a25175cc8f0855da68001fb6ea24f8e6955b2e1a02dc3f7d2 SHA512 f086003f676054a5527e3c1b81f9abdb76669e2b3935e7625f99d99ad0b122391646e8a186ca6a2840d5f03fff908630c11481b5166325ca91c08c2e46836f8d
+EBUILD fceux-2.6.1.ebuild 1550 BLAKE2B 26ad580addd456693cf339d0e6353138ce0702a0d8058b775109ed1ea613ca23bdb9fec13bd91fad2a098918d40f9e1a7288c0a48c846b31ed07f16762efebb9 SHA512 1fcebcb6226c7f2f04ced2c7f139a20dcf73c3a14cd4c34006484994f77cb8cf3733ad7302fe9d20872c92189bb5871c24c0d1c5dd479929c89a3b6bb20ba5c3
 MISC metadata.xml 570 BLAKE2B 2a0e6410b932f5445cfcbf2878212b022310e9e059c2a05da52ab55dc1c24f52fc31a51b70c63a2c8226989dad08afcbc0002255753c757d93cf0235c6f94ec0 SHA512 db6acd8c7c1beea1c86e56fd5e2caa7489848be6513c798e186739edf7fc47dd78a126037734dad255966e80e2d257f73915fdd7e7085472b775ad98a5b3e336
diff --git a/games-emulation/fceux/fceux-2.5.0.ebuild b/games-emulation/fceux/fceux-2.5.0.ebuild
deleted file mode 100644
index 3b064ef44c9d..000000000000
--- a/games-emulation/fceux/fceux-2.5.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=8
-
-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}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg x264 x265"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# TODO: QT6 support (disabled by default) when available in Gentoo
-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]
-	ffmpeg? ( media-video/ffmpeg:= )
-	x264? ( media-libs/x264:= )
-	x265? ( media-libs/x265:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
-	"${FILESDIR}"/${PN}-2.4.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.4.0-no-git.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	use x264 || sed -i '/pkg_check_modules.*X264/d' src/CMakeLists.txt || die
-	use x265 || sed -i '/pkg_check_modules.*X265/d' src/CMakeLists.txt || die
-	use ffmpeg || sed -i '/pkg_check_modules.*LIBAV/d' src/CMakeLists.txt || die
-}
-
-src_install() {
-	local DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
-	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
-}
diff --git a/games-emulation/fceux/fceux-2.6.0.ebuild b/games-emulation/fceux/fceux-2.6.1.ebuild
index b7b998d9eb64..b7b998d9eb64 100644
--- a/games-emulation/fceux/fceux-2.6.0.ebuild
+++ b/games-emulation/fceux/fceux-2.6.1.ebuild
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index d46f7420df8c..ec78f61ea0d9 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,3 +1,5 @@
 DIST mednafen-1.27.1.tar.xz 3363540 BLAKE2B f74c251300af2348db00d68ef2cd998bdf4d6fb06873e03e0027d836b5b1217901b1e2cf922877b1db4c278ba4cc2674e4875a17fff52a3b8be5a447670a6385 SHA512 f55d86baa8c77fc98aae63a38235eb64f64131f180c40ed1ac7cd2ad845230348fbba05643eb5e6af203e56c39c8011b632d2bcecbd2c9f2c19b2447f6b99e83
+DIST mednafen-1.29.0.tar.xz 3512784 BLAKE2B bea5ecfe00f97d1cf81eccfe4264d8fea666c9c8543449ca8c1e4e064f89a100f6bbe77b23d42d5d9c4a7e005792006d599852a201f1d95a756742bc58ecda81 SHA512 375f0fb4f12907faf56b4e9ecdc44c1655b0660a3773240fe3118f2b261e171479b8eb254299f899fc442b54041c941eab2a5f343aec559d9731c3e92cde0569
 EBUILD mednafen-1.27.1.ebuild 1823 BLAKE2B 81c33f8a2e85ede29f08b00f6e17bfba4fdd0f6ec3a907b819369d56f593dfbb470a758d517f33e83af992782725b1ba45c61df88b976429fe8eef35c138210c SHA512 d31c0792213c3f0afee5e10e1739be73e5da3279cf06665dc6f1f638a0637d705eec22f6a8fef83d340377050450bd2ea08d3d3823dcaa57c558e87c496b7f87
+EBUILD mednafen-1.29.0.ebuild 1924 BLAKE2B 0a0877e1467d10cc5171605032fe6dd874067c92d8d2eb77904156b5d598f517b3bfa3652ae18a7c68d00f284af9fa530c48943555eaa3269b593212d77cd856 SHA512 2b574be5e4284e7439aedef14f2f9f8d0c66c58781b91a64768dcdde601ac6dd93a18cd8334140705ef1770b3565d7fc968b747f9376752d00d64749912c0b45
 MISC metadata.xml 332 BLAKE2B 94c24607fd634ac943de538dd00b5511e4976e2eb9d1724dd4b7e9fff1508b146caac910eb5fab93ef2049e2dc95598d787d738b1613d59739a1772b3bd58f9e SHA512 6c80eda23e81013c2cc990aea57ad62d592a777d8afbf0f767bb1eef2efc13103b3917b14f9d080db67e8b5899de7882d8bf2adc568274dae1014fa6b94f27df
diff --git a/games-emulation/mednafen/mednafen-1.29.0.ebuild b/games-emulation/mednafen/mednafen-1.29.0.ebuild
new file mode 100644
index 000000000000..a57c4dde457d
--- /dev/null
+++ b/games-emulation/mednafen/mednafen-1.29.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pax-utils toolchain-funcs
+
+DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
+HOMEPAGE="https://mednafen.github.io/"
+SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cpu_flags_ppc_altivec flac jack"
+
+RDEPEND="
+	app-arch/zstd:=
+	dev-libs/lzo:2
+	dev-libs/trio
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/tremor
+	media-sound/musepack-tools
+	sys-libs/zlib:=[minizip]
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# don't let the build system mess with CFLAGS more than necessary,
+	# most are questionable (see README.PORTING/configure.ac comments)
+	# -fwrapv: kept for bug #539992
+	sed -e '/CC_OPT.*CODEGEN_FLAGS/{/-fwrapv/!d}' \
+		-e '/CC_OPT.*NOPICPIE_FLAGS/d' \
+		-e '/CC_OPT.*NO_STACK_PROTECTOR_FLAGS/d' \
+		-e '/CC_OPT.*OPTIMIZER_FLAGS/c\:' \
+		-e '/CC_OPT.*-mtune.*SS_EXTRA_FLAGS/d' \
+		-e '/LINK_FLAG.*NOPICPIE_LDFLAGS/d' \
+		-i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# disable unnecessary warnings not to confuse users (see src/types.h)
+	append-cppflags -DMDFN_DISABLE_{NO_OPT,PICPIE}_ERRWARN
+
+	local myeconfargs=(
+		$(use_enable alsa)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable jack)
+		$(use_with flac libflac)
+		--with-external-{libzstd,lzo,mpcdec,tremor,trio}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=(
+		ChangeLog
+		Documentation/{cheats.txt,fname_format.txt,modules.def,settings.def}
+	)
+	local HTML_DOCS=( Documentation/*.{css,html,png} )
+
+	default
+
+	pax-mark m "${ED}"/usr/bin/mednafen
+}
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index 9d39cc77afed..c4a2103c6734 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,4 +1,4 @@
 DIST melonDS-0.9.3.tar.gz 2241325 BLAKE2B 0ea7fbcce039a60a0553ae45d11f0b1550bfec2300faf1c99c3ee531bd5949c7293bec187fbf53e400bbb6280df29db141b2d1bcb294a8abf2eabb71993db686 SHA512 37f26f3a9784873ce1664645cea70049725367f5fe62f7c58842ebd5da2c73ffe423695dddb0ffd444bdf59df2a3fcd778cdf95b2bb083014b961fed282953f5
 EBUILD melonds-0.9.3-r1.ebuild 1687 BLAKE2B e9877ebda5bfdabec8d913096c93719474220b615c73ddeb2c905464d035cf05889399cf938cf137670c1485bd957beca7b11663d3df3a30281fcaba6c926f35 SHA512 142b857f3f5daee2031367d4bfe6bd96531f88f7a7aca5f7b5a3067e08c880576418d4533c120fab75a9a96a34cca61799db33301cfd3b46c701efb8ce4d1520
 EBUILD melonds-9999.ebuild 1687 BLAKE2B e9877ebda5bfdabec8d913096c93719474220b615c73ddeb2c905464d035cf05889399cf938cf137670c1485bd957beca7b11663d3df3a30281fcaba6c926f35 SHA512 142b857f3f5daee2031367d4bfe6bd96531f88f7a7aca5f7b5a3067e08c880576418d4533c120fab75a9a96a34cca61799db33301cfd3b46c701efb8ce4d1520
-MISC metadata.xml 403 BLAKE2B a0a5d196ff90c5af9d9b2b0d9f2bf7a438f010a6e0b3a655828b0fc13030e33fc383e04cf5aadc1304ffd291d5c0248dde272757e4b66c15a24cb183a87e846c SHA512 2fd669c060bbccdcad40584fd8d949521d162281fabef1b1e258a200e9b3741fd8a55f69dd79542f4253bae5c5662984874644b8251c02e43a61f18cee224537
+MISC metadata.xml 404 BLAKE2B e9abe00b5ee8196030846be4e7a9e224c0fb7356f88a39949b219bb7355bcac50f6ca28b299a40f056e5a105903cb156aed77731fb3ed61d2ef88becf35d0dc3 SHA512 6e2926035441d9c93759ad92cb2c026a10d28b8354e90d56361b4afc1aa6e7f0e4bb49900ad9f6025f8f9b7070df5691583074f30620196f1305919bd7cfdbdb
diff --git a/games-emulation/melonds/metadata.xml b/games-emulation/melonds/metadata.xml
index 598e25db79ba..4fb3ef167d8c 100644
--- a/games-emulation/melonds/metadata.xml
+++ b/games-emulation/melonds/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person">
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4640a8283fdb..eadeb2708c51 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,5 @@
 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-r2.ebuild 2808 BLAKE2B f947a2cb7ec6a2ba32514a622317913a3b63fc4063c7b7a1aa36012ecefb8bae327a8673e9b1d66002f6f059cd0d08faf3de4d79566fe451305a47b2de615ced SHA512 cf504517c5dac9cfff4adaf7fe7425e468acd7f1e5a8c7ff0670040ed5e8970dd8e304d716831e8cea4c1fc015a499e4db791fd0df4913f28ed25cc89664433a
-EBUILD pcsx2-9999.ebuild 2786 BLAKE2B 5144f6e2413da37f9848c86e446aa463b295d93e9987f83a63f50220376abf60cc090527bf64682d5518364e54dc5d2cc183c03ac7e82585864a1052d6a9880f SHA512 e4053c16865d3eaf501025f95272186976bf4de227fcd11f2ecd820e2f8e506adbbe42d80f2f3ed2466a413a10fc6d6c598f5a15980496528f072911d21bf690
+EBUILD pcsx2-9999.ebuild 2809 BLAKE2B 967a29c69976ed96b7dabcf5f9bda82fa90f8a10ba18853b1968dcb61155d012672f373933b8a59c56d94405d3eb7d88d6d52b4cef3a38b4463ba312f6f539f5 SHA512 9dccea1357fa2705faec7a37418a951228c91cb7de8d74128bd1895693ed3986148e7094966f440509776bbe1ebd05fea0ed777b409399010bccd657a610ad07
 MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 98c547c226ce..f5543f61bed1 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -96,13 +96,12 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
-		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DSDL2_API=TRUE # uses SDL2 either way but option is needed if wxGTK[sdl]
 		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
+		-DXDG_STD=TRUE
 	)
 
 	setup-wxwidgets