gentoo resync : 29.06.2021

8 files changed, 96 insertions, 1 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 319e19603795..d957bc472b78 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 2fc5c0e9b415..1235ba3b8de9 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,4 +1,5 @@
 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
-EBUILD desmume-0.9.11_p20210409.ebuild 1090 BLAKE2B 932b88d648771a739f98d3d3b82acb74a76dc4385392872c61cf1493d3a71341d8e084ffe7b05263e8caf7db89fa19ab0ab2364a9bc980c408605b46eceab5c4 SHA512 6f06b5e559298d6feaf74a19d12e825f03882fb137fd5280653df0b0fa5f4103e83f8e9bcb47232b0ca26813768eacfc140788871cda3bf71898d2f17651d185
+EBUILD desmume-0.9.11_p20210409-r1.ebuild 1134 BLAKE2B 530c34eb5db5934ec48dc253328c6f19932d07b6438eee17faed79839a6b567e7a0a62159c132e6e2637e58466138672aef9052c34a5472f69e7aa1c61717749 SHA512 3c910c91405227139f3d2b478d957230b64186a50b8f444f2bf07cf0d19049642e4981c1c45e10171c3ba17af4a7cdf1c75f8e7ba6e36aff1553e75ab581b517
 MISC metadata.xml 633 BLAKE2B 052f681fd7ff8b6a3d4dd64e5a9fea8fd5db7e782864a913cd382c1da3d984e09033f3d272a4bb966aab14f3d9026b673a730e03565b56c1a68a03a7391ad8c2 SHA512 a41bf6b90e75336de2819de1bf3be17e40a38e4d13ee782b8a6c951b80bedab7f0739c0c11977a5587aa906ba7da72ce8024b5d4b63338af53266a59ae6f0fa7
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
index 752de42b7cbf..c3a847606182 100644
--- a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
@@ -35,7 +35,9 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-gtk-cliopts.patch
+	"${FILESDIR}"/${P}-openal-automagic.patch
 )
+
 DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
 
 src_configure() {
diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
new file mode 100644
index 000000000000..565ea3f5a7b0
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
@@ -0,0 +1,10 @@
+Option only changes whether the dep is required and doesn't disable it.
+--- a/desmume/src/frontend/posix/meson.build
++++ b/desmume/src/frontend/posix/meson.build
+@@ -176,5 +176,5 @@
+ endif
+ 
+-if dep_openal.found()
++if dep_openal.found() and get_option('openal')
+   dependencies += dep_openal
+   libdesmume_src += [
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index d8e200ebc7a0..1aa8f07b4120 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,4 +1,8 @@
 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.4.0.ebuild b/games-emulation/fceux/fceux-2.4.0.ebuild
new file mode 100644
index 000000000000..b82b752cf01d
--- /dev/null
+++ b/games-emulation/fceux/fceux-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit xdg cmake lua-single
+
+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"
+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]
+	media-libs/x264:=
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-no-git.patch
+)
+
+DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
+
+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
+}
diff --git a/games-emulation/fceux/files/fceux-2.4.0-desktop.patch b/games-emulation/fceux/files/fceux-2.4.0-desktop.patch
new file mode 100644
index 000000000000..e1f924be5246
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.4.0-desktop.patch
@@ -0,0 +1,18 @@
+Remove hardcoded paths from .desktop, not replacing with
+make_desktop_entry given upstream's also defines MimeType.
+--- a/fceux.desktop
++++ b/fceux.desktop
+@@ -7,4 +7,4 @@
+ Comment=Emulate NES ROMs
+-Exec=/usr/bin/fceux %f
+-Icon=/usr/share/pixmaps/fceux1.png
++Exec=fceux %f
++Icon=fceux1
+ Terminal=false
+@@ -17,3 +17,2 @@
+ Exec=fceux -f 1
+-OnlyShowIn=Unity
+ [Desktop Action DefaultConfig]
+@@ -21,2 +20 @@
+ Exec=fceux --no-config 1
+-OnlyShowIn=Unity
diff --git a/games-emulation/fceux/files/fceux-2.4.0-no-git.patch b/games-emulation/fceux/files/fceux-2.4.0-no-git.patch
new file mode 100644
index 000000000000..fe9a7d35b46b
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.4.0-no-git.patch
@@ -0,0 +1,12 @@
+Prevent meaningless use of git (QA notice if missing) in a release.
+--- a/scripts/genGitHdr.sh
++++ b/scripts/genGitHdr.sh
+@@ -8,6 +8,6 @@
+ echo "Output File: $OUTPUT_DIR/$FILE";
+ 
+-GIT_URL=`git config --get remote.origin.url`;
+-GIT_REV=`git rev-parse HEAD`;
++GIT_URL=
++GIT_REV=
+ 
+ echo "// fceux_git_info.cpp -- DO NOT EDIT: This file is auto-generated at build" >| $TMP_FILE;