gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-engines
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
30 files changed, 513 insertions, 268 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index be373e7f1c7b..2795e1ea6fe7 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index 52d92e12f4ac..0b87d7dc09f2 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,3 +1,3 @@
 DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
-EBUILD box2d-2.4.1.ebuild 574 BLAKE2B 3307f240c56e80e5fd715551b18fe7a41b9d7afbd5afec2dbf1dbeec470dea259c59715121062f966fa40e9826f651d1b281f02aab3b0ba9c9ebb4b47cd5adf7 SHA512 a92abbf1ea2430dc34e70fe820fc69ea7acf77779ea57282d07df51f75241e4cf1234f8e2b6f8143f4ab9d2834ab17d0ce052c6e12ba8764b28a276d938462f9
+EBUILD box2d-2.4.1.ebuild 586 BLAKE2B 165943403b8fe78d02a008f034496f47b0ebded443815c7dd99397eb57bde66c0c0a6e18d57b02af4f491320bb236f489f73ad2c8992f3a00b0ec4e65d819be2 SHA512 ef4c8935a7950ab34ff073f365ab3da73a4c6af64efcbcc1c6834b33b0fb6960b45363505b269db5e7b04e94c84ced8b916adc798fbf560ae6f88c040a61a2c9
 MISC metadata.xml 333 BLAKE2B 8744749fd1f8ee25c33a64b870a484d69549b738d2f5d663bd0e10fc09eeb40b347e1bc32cc80b7623c2aef4c4b37d185cc06f42159396f368ca2917b0f06d84 SHA512 27fa995f144fdde8f6e62aed1d6bc68e830ab912f34a2f4f24b4fa0882a42f3cabd5f1d5f81361a1ce8311a5cc56156408782e16cae8c9faa621c98c2b64bcce
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
index 63093288e008..5e4e5ca8df3c 100644
--- a/games-engines/box2d/box2d-2.4.1.ebuild
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/erincatto/Box2D/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 0ab84482a690..4e005628d12e 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,7 +1,10 @@
 AUX devilutionx-1.1.0-no_bundled_font.patch 2134 BLAKE2B 90ab8f267f0a1cb337b3d5432e757931b434eb6ee3915270253daae061400c1425b004f23e3f528daa82ee591d1d7acf7013a2657c01bf387b30976828ec66c8 SHA512 2a9fa26bff1776fc7a8617dd6467b18fea94b0c2b8a651c74cf1dd9f29eff8ea09b4fa188e215264ff622a9aebb597c59299fa489f19328712ce3ec9073a1127
-DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
+AUX devilutionx-1.2.0_pre-no_bundled_font.patch 1181 BLAKE2B 004e58c8fb6d29be37ee6471dbecef52b0503ea6b2ad7d892236805f5f8fe42e2247bd94af65fa54a6f53c223d9fae2aee76a6e0959e3266490e954301bd3ced SHA512 7f1823283015f6d2f7c9f34c3b0c9a06e1127d82370ce1d7f5fcf5e429c2bd24e32620871e5eaf1dc7e598da17b73f21205a74f3488ba8a35b4cd258b9bc221a
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
-EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
-EBUILD devilutionx-1.1.0-r2.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
-EBUILD devilutionx-9999.ebuild 1584 BLAKE2B 31cfbd6270b2c29c5f8afb973ff1b014746f8fe2cf09a037509ff9109afa83d9a67251a31da19b02efccc807728726eb6e7f83c37052a0799cab223ab136e396 SHA512 2bfffd043da7b982126751e19b12412078118a6860bc12e447ffd4bfb57abb7d97b27dd0a8f748de6e8d17fdbcb65e3aa54035db52262947d3f74303fd6fdc56
-MISC metadata.xml 514 BLAKE2B 4727c5e4a5c51860b85e4e4eb8edb531294617a740d1d3deb246f6a35fe065f050fead6b19ceaf4580d51e692fef138a02fa18cd21f9cb749701ac7fd53fd5ee SHA512 3f67564be4d4944f8e21e759f4fce6f9f13887538b903f644f5d8549cfa8349b7827da2f7b3d46210f3f712f4c6e8041484100b901aaafa464a380e718be929e
+DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9
+DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
+EBUILD devilutionx-1.1.0-r2.ebuild 1503 BLAKE2B 3bccbae2d574a7d9747710e9c80770740a0d65cbf437ed460d09694e65ee3cc910dc8e337a19caa4cb237acf2202ce39bbd8cb05cbe1d7c1afb0b1bc68d6cb1d SHA512 3489ce76dbe9e8b6c98d4c2c3e3589dd9386dca815eb0d6f07fd4515c818a3f11afe68c26ccaf600f7be4ee8978c9ce69b4351d00b0a69b9752538b52ddc3ffa
+EBUILD devilutionx-1.2.0.ebuild 1445 BLAKE2B d5b2ef602c063c69d64ae0da168a7fd603c5accb0ce1b4bea8ee4a718aadf3e21b7d92b502ec153bb6a1563d1a562ee6129c544394c2a7bcae62ae54b0772349 SHA512 99d624bb30eae10eb1131d6ffa1f186e3b610e1bcb2785923813d140b0855215f10f6f4b46e05a514ba85da3323c202a43e54d3efeb770ba60a3e4f21cbc1137
+EBUILD devilutionx-1.2.1.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
+EBUILD devilutionx-9999.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
+MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
index 913e1f40eef5..ed7391e75b02 100644
--- a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
diff --git a/games-engines/devilutionx/devilutionx-1.0.3.ebuild b/games-engines/devilutionx/devilutionx-1.2.0.ebuild
index 90302aa10ef4..6f93a6c2ac09 100644
--- a/games-engines/devilutionx/devilutionx-1.0.3.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.0.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
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -39,34 +39,24 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
-		-i SourceS/config.h.in || die
-	sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
-		-i SourceX/DiabloUI/fonts.h || die
-	cmake_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+)
 
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
+		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
-		-DFASTER="OFF"
-		-DLTO="$(usex lto)"
 		-DUBSAN="OFF"
 	)
-	cmake_src_configure
-}
 
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
+	fi
 
-	local size
-	for size in 32 48 ; do
-		newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1.ebuild
new file mode 100644
index 000000000000..01125c9e7e42
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.2.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-fonts/sil-charis
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+)
+
+DOCS=( docs/CHANGELOG.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDISABLE_LTO="$(usex !lto)"
+		-DDIST="ON"
+		-DUBSAN="OFF"
+	)
+
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo "In order to play the game you need to install the file"
+	einfo "  diabdat.mpq"
+	einfo "from the original game CD into the following directory:"
+	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 5c1340040ddd..01125c9e7e42 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug +hellfire lto"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -40,9 +40,11 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
 )
 
+DOCS=( docs/CHANGELOG.md )
+
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"
@@ -50,15 +52,13 @@ src_configure() {
 		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
 		-DUBSAN="OFF"
-		-DHELLFIRE="$(usex hellfire)"
 	)
-	cmake_src_configure
 
 	if [[ "${PV}" != 9999 ]] ; then
-		# Build system still doesn't reliably set release version
-		sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" \
-			|| die
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
 	fi
+
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
new file mode 100644
index 000000000000..01f4006dd13f
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
@@ -0,0 +1,40 @@
+From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 31 Mar 2021 17:55:03 +0200
+Subject: [PATCH] Fix font location
+
+https://bugs.gentoo.org/704508
+---
+ SourceS/paths.cpp          | 2 +-
+ SourceX/DiabloUI/fonts.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp
+index dd60fcb5..1c4f9d69 100644
+--- a/SourceS/paths.cpp
++++ b/SourceS/paths.cpp
+@@ -11,7 +11,7 @@
+ #endif
+ 
+ #ifndef TTF_FONT_NAME
+-#define TTF_FONT_NAME "CharisSILB.ttf"
++#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
+ #endif
+ 
+ namespace dvl {
+diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp
+index 178dcbe9..5f825886 100644
+--- a/SourceX/DiabloUI/fonts.cpp
++++ b/SourceX/DiabloUI/fonts.cpp
+@@ -66,7 +66,7 @@ void LoadTtfFont()
+ 	std::string ttf_font_path = GetTtfPath() + GetTtfName();
+ #ifdef __linux__
+ 	if (!FileExists(ttf_font_path.c_str())) {
+-		ttf_font_path = "/usr/share/fonts/truetype/" + GetTtfName();
++		ttf_font_path = "/usr/share/fonts/" + GetTtfName();
+ 	}
+ #endif
+ 	font = TTF_OpenFont(ttf_font_path.c_str(), 17);
+-- 
+2.31.1
+
diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index cb26cf9fd006..6f7209b5d36d 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -6,7 +6,6 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
-    <flag name="hellfire">Enable support for Diablo Hellfire Expansion</flag>
     <flag name="lto">Build with link time optimization enabled</flag>
   </use>
   <upstream>
diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index b1fde9d5833b..9980d587ff20 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1,6 +1,4 @@
-AUX frobtads-1.2.4-tinfo.patch 371 BLAKE2B 6690cc8e118aaacb86e9451fb87118733960e6416396df03d0ad543cb530bffbe8709afdcdd6af207ca6c089ffca40dcec9380def6b6df173eea5ef4c76346e9 SHA512 69786ccc1c8670db199666a42d8d5ca11ac6deea2300732aae76bc54612827b818f331eb96bbc8af0aa45b94bbb0954f21d95bafdd4639399532a1b5e6815be8
-DIST frobtads-1.2.3.tar.gz 5227704 BLAKE2B fd481201da6dbddf3b0f5adf7c600282c9500bd65cebebf13e23b139ca1e9793091c6df50bebebed179c6f775d188c8ccbe8450d0058863c55dd322e8a92ce32 SHA512 4efb888860edda24bb5a5812967d0b863614558e9839cf0cfabc649ab0175719bf663de5e725034ba160c015d269dbe2df046cf47ad1019e668bf5b1fb564d7d
+AUX frobtads-1.2.4-tinfo.patch 345 BLAKE2B cf4ffb8870f064aac6d302c5dd4dcaea4a1ee1cc7aacc1d74b299f18de25b2150571ecc468cb1ba326680402c7cf99b95d4f0dc78959a5a7d4209e53f56d66df SHA512 632b599b115cc73c3642e8462fd916146e2451be47b44c43860f5dc87bc6c510eabc62f4d575b814eee55e89e99f03b3a445d60e45dc6cc8d60052835ccac685
 DIST frobtads-1.2.4.tar.bz2 3801366 BLAKE2B 871a4cfd432f1a72915de0652def2f2a9a3cf1bfa20b070c2e59ced673c736584a36b3d17e7d5812ad7cd883c3e038e49f962635a5794d6c914d99651bfd0a55 SHA512 f49f58114cbd78f23fcc3835025af7874da968af825abd449e9ab83c4a90e8d70f8cfafa83780f0631ae9bd2793cce2d5dd947c13ee38ba0d06829d2803abf12
-EBUILD frobtads-1.2.3-r1.ebuild 1084 BLAKE2B 3b4ac366d3b1730473a251261f0c08f24ae8b5c3a9e70fe9f359574a409c2f8f4b62806c92f48ae26c2e5998933a64c098940c33050961ce93becc5c48495c18 SHA512 8f7b51246acedd865d9a396819545964fbcfc69f61c8381b0da2387fb8695fe9655d07097d448a74a8a3606ff3b9f32c738f829e9942ee8bdfc8b332f435c909
-EBUILD frobtads-1.2.4.ebuild 1155 BLAKE2B 5daae9b4da5e7545fc3140bae70fad36a0ffc3db179c68fa36bd88db341cc1603a6789aa73c9bfe0580c04c57a4025d502d1c98624b1e8c53cd718c35ff49a8c SHA512 c8f29e693069df59125c2495c74817b3362d84f86daef3c3a2abfaa0f8f4ab91271be1413c9164cd25988f40d05a83fdf3ebe3b9dc66538beeeb61bd75be55fc
+EBUILD frobtads-1.2.4.ebuild 1166 BLAKE2B 85b02bc732f16d376b386443a8962678054c0bfa828ad124d356f67961ffedcefc4ad616326807eec85a675b58a3cfe6817eb7ce23fc5f7be61b4e0d3e2f8957 SHA512 d52c491d53070b64116bbb08b25ded057b13e25c7af1483ec505bf2c63fa4dd2d9dae7fd890b96f5b0a21a290ca4f07dbd0307e22c2c1782f00df1bd65f6ee1b
 MISC metadata.xml 394 BLAKE2B db39dd99a448935896847c3ce0c824a3043d65d82e7d35cad3afab2538aebffca96c532f83182bf2e28fab22fcb0d6145e6e5a383def6d956db6d0558e73f481 SHA512 591c0df18a2e4e1469e1f95dce9c74f3b66261377b88ec9dde79c56094253a5579427a2fa836fb1c2926344b95a471b7d13bda4a53f4c6a064b06c61d89e1ab3
diff --git a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch b/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
index c50b5a05de43..f37f2ed22ce2 100644
--- a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
+++ b/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/602446
 
---- frobtads-1.2.4/configure.ac
-+++ frobtads-1.2.4/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -88,6 +88,7 @@
  # doesn't hust to try pdcurses as a last resort.)
  #
diff --git a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild b/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
deleted file mode 100644
index 7b35a8571c33..000000000000
--- a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
-HOMEPAGE="http://www.tads.org/frobtads.htm"
-SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
-
-LICENSE="TADS2 TADS3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tads2compiler tads3compiler"
-
-RESTRICT="!tads3compiler? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0"
-DEPEND=${RDEPEND}
-
-DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
-
-src_configure() {
-	append-cxxflags -fpermissive
-	append-libs $(curl-config --libs)
-	econf \
-		$(use_enable debug error-checking) \
-		$(use_enable debug t3debug) \
-		$(use_enable tads2compiler t2-compiler) \
-		$(use_enable tads3compiler t3-compiler)
-}
-
-src_test() {
-	emake -j1 sample
-	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
-		save
-		testsave.sav
-		restore
-		testsave.sav
-	END_FROB_TEST
-	[[ $? -eq 0 ]] || die "Failed to run test game"
-}
-
-src_install() {
-	default
-}
diff --git a/games-engines/frobtads/frobtads-1.2.4.ebuild b/games-engines/frobtads/frobtads-1.2.4.ebuild
index f0fd3816a632..6270e7fa08f6 100644
--- a/games-engines/frobtads/frobtads-1.2.4.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -16,8 +16,10 @@ IUSE="debug tads2compiler tads3compiler"
 
 RESTRICT="!tads3compiler? ( test )"
 
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0="
+RDEPEND="
+	net-misc/curl
+	sys-libs/ncurses:0=
+"
 DEPEND="${RDEPEND}"
 
 DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
@@ -28,7 +30,9 @@ PATCHES=(
 
 src_prepare() {
 	default
-	eautoreconf #602446
+
+	# bug #602446
+	eautoreconf
 }
 
 src_configure() {
diff --git a/games-engines/nazghul/Manifest b/games-engines/nazghul/Manifest
index ae421b41c8bd..67fcdb46a23d 100644
--- a/games-engines/nazghul/Manifest
+++ b/games-engines/nazghul/Manifest
@@ -1,3 +1,3 @@
 DIST nazghul-0.7.1.tar.gz 7929363 BLAKE2B 4afcfcf47082cf75a98ce73ef115cf0a2f4b35e48cdfaddf362106114447543e853f22365ae773fa2489deb47caca3fa888e738213de294b2516b9f06672dff5 SHA512 6484698609ad88c9d7d2d6c2dc93aee98614917b53dca826a2827a9375192e323e40de1f69a3de1e8dab35f02834430e1ee947f4bf6088fbf510c416da1d8c0f
-EBUILD nazghul-0.7.1-r1.ebuild 912 BLAKE2B 1c5c41e1a8d80b787b0aa46677765dc878fb49a8bb5aa9c16eaa05ff09bfad8f553e52ecb74a6f8f803d3d69053b325b89dc93d9a682d36813e78453fd4fa86d SHA512 e1ed9fad28acc98df1994d7b6a4662d73ed9c488f1524c7341908a4e3cc26224e43db642dac8a8d68aa340b5548f4088d2186c8e937b4353ad43d9ee8910fe1a
+EBUILD nazghul-0.7.1-r1.ebuild 907 BLAKE2B 4627e146f215d38887b53eead3d51e1444c0b1db2f5dc5d7962a720b54922fd736eb476eaed9ddcc4ed5a513718ccee959b29e1eca0f8e52db66f077d4a0fa97 SHA512 71385f171078ead0b8d663b873cfb2e55dec2db38ab87daab6c06c39f5dde3a4959d9cbe4c8346fe4c3468107b733b037f22354684216815c6a6ef9544333f3b
 MISC metadata.xml 330 BLAKE2B 8a1fa464b38ef7c1c4f34958bf0849ee0f82db4e8c421f02397da457c1b0e2b2d4fe09e051f706a0237919edcc11bb2b13363ec05f0dcc1ca6cfc96856bbd193 SHA512 13146683d0f1943936e5c43ac8e0495fbaff76c788ea3ec3eb3437e0eb84268d2c969a11b97c0792cad64e7e32aabbbe4f2ef65ad038af4e4c9cacadecfe9467
diff --git a/games-engines/nazghul/nazghul-0.7.1-r1.ebuild b/games-engines/nazghul/nazghul-0.7.1-r1.ebuild
index 3bcc845864d9..7b3c9b70ec1b 100644
--- a/games-engines/nazghul/nazghul-0.7.1-r1.ebuild
+++ b/games-engines/nazghul/nazghul-0.7.1-r1.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=6
+EAPI=7
 
-inherit eutils vcs-clean
+inherit desktop vcs-clean
 
 DESCRIPTION="A computer role-playing game (CRPG) engine with game called HaximA"
 HOMEPAGE="http://myweb.cableone.net/gmcnutt/nazghul.html"
@@ -12,17 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libpng:0
+DEPEND="
+	media-libs/libpng:0
 	>=media-libs/libsdl-1.2.3[X,sound,video]
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[midi,vorbis,wav]"
+	media-libs/sdl-mixer[midi,vorbis,wav]
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	ecvs_clean
-
 	default
 }
 
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 7577efe392e3..b5e09fb0d266 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,5 +1,9 @@
 AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
 AUX odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch 879 BLAKE2B ac627db089ddeab8d4c34601b44d70a54e5de0a3e7bfdb6eccf3c0798df81526df5e7be97323b5c33f8594c5f83be8d336cd23c6aadd34eb7046b0ad32eca028 SHA512 67a48daeb9774694ed957e4583deddb6e19e1bac965e823c5c165165013b987d5c0ec62e2272ab5e75694270b2c0f793d5bbef4f4946e98047a17c897ce45a77
+AUX odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch 835 BLAKE2B c15d7fcf8e2992a01f8c329c494f118c4d7279b10fd1acce97a03a6bd08a4aeede40b44b7f3d99c6140e252ff154ff607861733e35fa5e0f898f6b56b592cd2c SHA512 86fe37efa3bbb03d89ef02ea7792809d38c6abfaa607af74cda4815722ffc4bd35502a83bccd4c902b697d9420bde078228d8e40b21e722a48cb608627366c71
+AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c
 DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
+DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
 EBUILD odamex-0.8.3.ebuild 1801 BLAKE2B a96d8efba5ca414b51ac6a3d45e381ae6fc2ecd2dcaec437deab66338152c4f5bf056ea6cb4a3d6505266a0535a39019a4f9a65c8c4eb31e05af9ab7d9284d60 SHA512 3c443abd87b5599f74413020e4f84d5b273357117717dd32b7d8ac3a76dd2c6a33a977878f765a0a793a1994fade7e6ca11c2faba425322203a4258472218cd4
+EBUILD odamex-0.9.0.ebuild 1837 BLAKE2B fef2b8796d963b50f1995a2dd216858c588df500d445e6f851a1ff12cd6260291aee07ab3d58965d4ceef083960d7603adc7432e4c849533a6077fc362df802c SHA512 3d7de60fdeb55593e31ab92d90782b5d2063de1966dddb9235e389523217023fe226572ceef76497c829bb9e4f07028dd7c2399113ef11bb62b50d1bbf3f6ef2
 MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843
diff --git a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
new file mode 100644
index 000000000000..654085d1d252
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
@@ -0,0 +1,24 @@
+From 3707d8ebad7a4a0664ca4d5a5a5bef4a276af6a2 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Mon, 29 Mar 2021 20:30:10 +0900
+Subject: [PATCH] Set IMPORTED_LOCATION for jsoncpp
+
+---
+ libraries/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 2ffe95a5..a7dcb83b 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -172,6 +172,7 @@ if(BUILD_SERVER)
+     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/local/include"
+     IMPORTED_LOCATION_DEBUG ${JSONCPP_LIBRARY_DEBUG}
+     IMPORTED_LOCATION_RELEASE ${JSONCPP_LIBRARY_RELEASE}
++    IMPORTED_LOCATION ${JSONCPP_LIBRARY_RELEASE}
+     MAP_IMPORTED_CONFIG_MINSIZEREL Release
+     MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
+ endif()
+-- 
+2.31.0
+
diff --git a/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
new file mode 100644
index 000000000000..77b6220041da
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
@@ -0,0 +1,80 @@
+From 4b9a8ca565e5cd388a49cd0fbe693b5332577c57 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Mon, 22 Mar 2021 18:20:15 +0900
+Subject: [PATCH] Unbundle miniupnpc
+
+---
+ libraries/CMakeLists.txt | 42 ----------------------------------------
+ server/CMakeLists.txt    |  3 ++-
+ 2 files changed, 2 insertions(+), 43 deletions(-)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 177a86a2..2ffe95a5 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -227,48 +227,6 @@ endif()
+ 
+ ### MiniUPnPc ###
+ 
+-if(BUILD_SERVER)
+-  message(STATUS "Compiling MiniUPnPc...")
+-
+-  # Figure out the correct library path to attach to our imported target
+-  set(MINIUPNPC_INCLUDE_DIR
+-    "${CMAKE_CURRENT_BINARY_DIR}/local/include/miniupnpc")
+-  set(MINIUPNPC_LIBRARY
+-    "${CMAKE_CURRENT_BINARY_DIR}/local/lib/${libprefix}miniupnpc${libsuffix}")
+-
+-  # This must exist before the target is synthesized.
+-  file(MAKE_DIRECTORY ${MINIUPNPC_INCLUDE_DIR})
+-
+-  # Generate the build.
+-  execute_process(COMMAND "${CMAKE_COMMAND}"
+-    -S "${CMAKE_CURRENT_SOURCE_DIR}/libminiupnpc"
+-    -B "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
+-    -G "${CMAKE_GENERATOR}"
+-    -A "${CMAKE_GENERATOR_PLATFORM}"
+-    -T "${CMAKE_GENERATOR_TOOLSET}"
+-    "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
+-    "-DCMAKE_LINKER=${CMAKE_LINKER}"
+-    "-DCMAKE_RC_COMPILER=${CMAKE_RC_COMPILER}"
+-    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+-    "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/local"
+-    "-DCMAKE_INSTALL_LIBDIR=lib" # Without this, CentOS installs into lib64
+-    "-DUPNPC_BUILD_SHARED=No"
+-    "-DUPNPC_BUILD_TESTS=No")
+-
+-  # Compile the library.
+-  execute_process(COMMAND "${CMAKE_COMMAND}"
+-    --build "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
+-    --config RelWithDebInfo --target install --parallel ${PARALLEL_PROC_COUNT})
+-
+-  # Synthesize an imported target that can be linked against.
+-  add_library(upnpc-static STATIC IMPORTED GLOBAL)
+-  set_target_properties(upnpc-static PROPERTIES
+-    INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
+-    IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
+-  if(WIN32)
+-    set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
+-  endif()
+-endif()
+ 
+ ### SDL libraries ###
+ 
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 73a70000..e4b085f2 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -53,7 +53,8 @@ endif()
+ target_link_libraries(odasrv jsoncpp odamex-common)
+ 
+ if(USE_MINIUPNP)
+-  target_link_libraries(odasrv upnpc-static)
++	target_include_directories(odasrv SYSTEM PRIVATE "/usr/include/miniupnpc")
++	target_link_libraries(odasrv -lminiupnpc)
+ endif()
+ 
+ if(WIN32)
+-- 
+2.31.0
+
diff --git a/games-engines/odamex/odamex-0.9.0.ebuild b/games-engines/odamex/odamex-0.9.0.ebuild
new file mode 100644
index 000000000000..dc97bd284d12
--- /dev/null
+++ b/games-engines/odamex/odamex-0.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+client master +odalaunch portmidi server upnp X"
+REQUIRED_USE="|| ( client master server )"
+
+RDEPEND="
+	client? (
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-mixer
+		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+		portmidi? ( media-libs/portmidi )
+		X? ( x11-libs/libX11 )
+	)
+	server? (
+		dev-libs/jsoncpp:=
+		upnp? ( net-libs/miniupnpc:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Unbundle-miniupnpc.patch"
+	"${FILESDIR}/${P}-Set-IMPORTED_LOCATION-for-jsoncpp.patch"
+)
+
+src_prepare() {
+	rm -r libraries/libminiupnpc || die
+	hprefixify common/d_main.cpp
+
+	use odalaunch && setup-wxwidgets
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DUSE_INTERNAL_LIBS=0
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_LAUNCHER=$(usex odalaunch)
+		-DBUILD_MASTER=$(usex master)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_OR_FAIL=1
+		-DENABLE_PORTMIDI=$(usex portmidi)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use client ; then
+		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+		make_desktop_entry "${PN}" "Odamex"
+
+		if use odalaunch ; then
+			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+		fi
+	fi
+
+	cmake_src_install
+}
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
index 4e8eb904ca58..bee928f17f51 100644
--- a/games-engines/residualvm/Manifest
+++ b/games-engines/residualvm/Manifest
@@ -1,7 +1,7 @@
 AUX residualvm-0.3.1-freetype_pkgconfig.patch 4909 BLAKE2B 07df1a76ce6ba266602e7f32953d7072b3f1d67490c5bce2c3c35fc6a7bc1de643713e6448d07b0385f0ce6cf35e4ac1a2045a34b27293c36b5440c578b2db6b SHA512 1adece199451586af0c3e9d39f9ee432f58142d206fed5993340c6f0ec5b890f8813c5b0df190c04339e73fdcd7dbd7b7294889ec55678b848b68fc05955d0da
 DIST residualvm-0.2.1-sources.tar.bz2 5533814 BLAKE2B befcb42c823d31ff1e8793d0c902bfdf6b3728530c97b3f43ada5d3b2903a0cddba3247095d1674e62cdd75a6db28a7a5f3b1437e5c39cb5eccb37dff9d52fad SHA512 9eed93770ef1ad828934c32e937b861c93f1ebbb0d936f3f56668e654588f734dc88e29446f0a69f8f26475e96b8ce7ca85318758b99aabc9586756692c721da
 DIST residualvm-0.3.1-sources.tar.bz2 6711799 BLAKE2B 93d21bc5ee2c567b1ef256a69a2634761cd52211a0b2d926edc67b65e0cc1bf23b41c91225e6d43990d61e6c3761acf19defaa9b477ad882d332ad77c71af1a6 SHA512 491a77f1775718795d93f099fa39ec5888755ac1df610089c17209334b98ae783271078ed03a61ced09835aa327446804a55522d4b83f618dd3b843c231444a0
-EBUILD residualvm-0.2.1-r1.ebuild 1789 BLAKE2B 82af9d1d7e89216bd821d2192aa1255beaf1d9c1898f68e0bd308795f13e2c56dc310c0de2bfc4b015fd212e83209def10f6968c0c3c459428ac73efd0d36a48 SHA512 f1c4ae7f30667c83720c6d870017e747acd22b56697edcf38eb7e00ab03236ad5610e83e7956302a297fda1fe11c3a0a1356403d609413a0dc0ef5e0ef677257
+EBUILD residualvm-0.2.1-r1.ebuild 1783 BLAKE2B 0b52fc3ffceb4af731fd2c70d881069c3ba7880165cc5d205d0b4b2ca45409056ed088392311589ed33881e350e5469ee16017e770c4827ab6beb412b64c729f SHA512 1ae083f1172ebf501998c26da95a1fab572a6a3946ded2ebe99fac4f5a1af87bddce9344a913ad9edaf397fcfb714a0db0ead746d93ae2770013b96a7c11b38a
 EBUILD residualvm-0.3.1-r2.ebuild 2303 BLAKE2B 04a8a3158043a2668e5659269ac53958a91c630e445b6f5b841d14ff4bad5d8d26e97994febbb1a5fe3220882c5b32e9403616b2acb061a3faa4b9e16fd35e46 SHA512 ba04b02d1d8229099477e9dacfe2c38e22b5a73431e1be3193e5a2d5e089f20c5a31c8774ca3eb921e94b93689a8e0e698e6dfa862d21fd34c21f537eb5ce56e
 EBUILD residualvm-9999.ebuild 2138 BLAKE2B 23a9b027b5538be820d3f1e01c61064cc7dd4cf4f22b76126c850220a62ec476bdecbd94f802ee03f5c43cc21bf70e80e9947dd2cfa8168d7671842ec91dd4bb SHA512 c338b67ebeeb1fe9522d6629b599e79c839ef36151c6eaa4b9b35d7db902238435c1bb5f7bf728bd38bb255fcd37e7f5330e22162ad20cd15508c64fc813a229
 MISC metadata.xml 409 BLAKE2B 16d2ffcf68a4dad35833cf3f1929a1fb89811b08b6de461c7f90f02974ab04fbf7b809faac18dcabec9012607155c5dda0f7bbee54ad9863d3c9a38bc7bfc5ea SHA512 b54a3d662972aad050c3ad263de572b531b51b2d99580c2dd450d404dd5002362eaa33c40715e1055a9026680940cdc64a3b9b283dafc844be54f33848c5ea41
diff --git a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild b/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
index 15565c002aeb..a9272195b281 100644
--- a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
+++ b/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs gnome2-utils
+
+inherit desktop toolchain-funcs gnome2-utils
 
 DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
 HOMEPAGE="https://www.residualvm.org/"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-sources.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # TODO: fix dynamic plugin support
 # games crash without media-libs/libsdl[alsa]
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 5f292604f33e..b3ca9d992b75 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,6 +1,6 @@
 AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
 DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136 SHA512 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
 DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89
-EBUILD scummvm-tools-2.1.0.ebuild 1322 BLAKE2B 1d99ef88962b88e3e812f130a65da23642f9e84e726b02b142d788d3962cf812f79efb3ee3e0a7c1d7ca3dd6c38761ba980f10b3eb924617c054a87bb842a2c7 SHA512 590b55fd52a3af2233d2140f45450f2c89907319198789aece4469113d6291f96ec067558db7dc90d0beb42a051cd0012807afa3fd250567f114dee527678e4c
-EBUILD scummvm-tools-2.2.0.ebuild 1416 BLAKE2B 7187ecc0f026a4fa789d70e39f3c35232bd908b5852a0c4c5255ad0b8d98cd8e5879b242143678f04ee7e84ca7f22da0dcee2741944c34a2162644867db82e2a SHA512 e7592155fbc0794fb7e62a3e2d80a5398aebd239a9f7cbdcfcc85ac9daaa0e2d3f909f983b597daec857e55dbeab91baa3544e1ed993d5ab7eb176a7e01e7593
+EBUILD scummvm-tools-2.1.0.ebuild 1303 BLAKE2B 13cc74cfc4fc745e1f0debfef0a2415b5b693f92e1544e9969cd65d0c4f832c61084b26617e433eeca36c70071f9e8459336c6fd5f44fe946ace11a731310a4e SHA512 952d76a10e16e13ac2c138d19132e295972d705773cd2428dde0e67ffec22a1febdb81e16095d1a50a5f4f623d3f7c61680396751364f222e4baf7acb87adee5
+EBUILD scummvm-tools-2.2.0.ebuild 1397 BLAKE2B ff7e453710830f99d665a72afe8d528751c79081ecd67f58f5cbcdb2c318ccfcaf792f11af7ca7a21adad5bc310da9a361030918c5c4f35db71ba95c0b0ac200 SHA512 4cf8eed7f6d4f9a1bb50427c15276a7a8454c24d8296d59fba5511eb2f00be9cfcd0822469bdfb191f9bab6df9c69523d016557841c4aa192f01f03476e8986e
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
index 54cbb5e6684d..9920a02a2c51 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER=3.0-gtk3
-inherit wxwidgets eutils flag-o-matic
+inherit wxwidgets
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/"
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
index 8116e88b4f60..c514a09b8b71 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER=3.0-gtk3
-inherit wxwidgets eutils flag-o-matic toolchain-funcs
+inherit wxwidgets toolchain-funcs
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/"
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 050768d4b0f0..c0f530bc217a 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,8 +1,6 @@
-AUX scummvm-2.1.0-fluidsynth.patch 1393 BLAKE2B 080c704d493d21f0e5e4387bba0bf1a2354aaccf0e96b7383f956ef89eb973cf0cdf9f60a922a8e7bd25e520a6922a1879cc5614b42731c610c2c7da64033cad SHA512 6e577087ad6d67ee45d488c762ea41d4899001a31730c47cdf263619cc079e0abd3871aa8f947f681b6d59d76094c0278bd4ed8c2439ccc4d700aa32f860c318
+AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
-DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2 SHA512 a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-EBUILD scummvm-2.1.2.ebuild 2789 BLAKE2B 5b7cb6a8ae1f1fc3bc29d68ea541b4257ea4d22f2467b2e9a3054e463742dc089d0e8d4d0d721c56387ba8963edcb43dedf098d99ce7fa81491d1d61a0f5f7bc SHA512 cd0d059b6fed3c9cca2583f825a2c9bdc60fb96e00e82763e017a1d642558b3d30cdeb3a03f2bb1d27103fae09c57edaae4ebb38c40a012da4612012a463d32e
-EBUILD scummvm-2.2.0.ebuild 3012 BLAKE2B 35bc1755871d55348a3195ad998ad0c9dbcd1bac4fe8b0b52c940dbb7dbb15a8b576911f7e3780e411e42cc1dd5e4391868e223cd63f971771772c90f9e34963 SHA512 e1356c00c95363345c7254709a62cc891fcc94db7939af9e58d2655d384e41d492a392f2bd2a8d5af81ac438d0cf330814ecdc92badc2f94bf17bfa28f762bdc
+EBUILD scummvm-2.2.0-r1.ebuild 3055 BLAKE2B f0c889a16fad8891ce657b71f5b00e85f263c94d3adfc256720e9512b188a33bf6236dee7e0407db1c2620e5f90ab20d04d0c581120c303a0cd8f55856648cf3 SHA512 615e638aeb605b8386721d45a9564072ecf287942fedc750649149f4be319901ea60f495c8ec5cc9012cf6b275ff64a6efce7f4b8d8df558f46e48271fd0823c
 EBUILD scummvm-9999.ebuild 2995 BLAKE2B 1a484a278b024fe7a2ac4210f3a18b4a860c5c66ef313c2855b2dfce328c74dd507278042998e0503830851045ea86664d1d106175dfedb0422acd5c66a3feef SHA512 7417b5169f5b3b2e818749940b55bea092888bd216e960bbe76e33f1cb9c4a6278fbb8f431f1b1caefb1b60e0faf7c997bcf63edd5743049a231c413aa351d1d
 MISC metadata.xml 1119 BLAKE2B 69d76e676244d618d769418d210acc4a705ef155215ced601bd1cb7075faf99789f9d771d8333d13a7e62f54846a31f14c4b4f00860a0927f2593ae2786e7cfd SHA512 41dc677a597ced02d76ea1610ad1e7a68cfba4c9622d2e9144eea61574752fbd7958ea7452c3213685c34ea89d24631adc96a93991bd27f32bf29677be31787d
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
deleted file mode 100644
index 6b4760e16dda..000000000000
--- a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
-From: D G Turner <digitall@scummvm.org>
-Date: Tue, 17 Dec 2019 04:21:04 +0000
-Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
-
-The previous fix did not work as the forbidden exception had no effect
-since scummsys.h and thus forbidden.h had already been included prior
-to the fluidsynth header being included. This also meant that undefining
-the exception define after the header would have had no effect anyway.
-
-This new solution was suggest by eriktorbjorn on bug #11278 and should
-avoid the need to add an exception which would persist over the entire
-source file.
----
- audio/softsynth/fluidsynth.cpp | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a15247..f8c2412492e 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -20,10 +20,16 @@
-  *
-  */
- 
--#include "common/scummsys.h"
-+#include "config.h"
- 
- #ifdef USE_FLUIDSYNTH
- 
-+// Fluidsynth v2.1+ uses printf in one of it's headers,
-+// include/fluidsynth/log.h around line 82 so need to include this
-+// prior scummsys.h inclusion and thus forbidden.h
-+#include <fluidsynth.h>
-+
-+#include "common/scummsys.h"
- #include "common/config-manager.h"
- #include "common/error.h"
- #include "common/system.h"
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
new file mode 100644
index 000000000000..8bb94ec6ab6e
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
@@ -0,0 +1,150 @@
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index e0d7c4e3df..d8e82c24f5 100644
+--- a/audio/softsynth/fluidsynth.cpp
++++ b/audio/softsynth/fluidsynth.cpp
+@@ -46,6 +46,14 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// We assume here Fluidsynth minor will never be above 255 and
++// that micro versions won't break API compatibility
++#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
++#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | FLUIDSYNTH_VERSION_MINOR)
++#else
++#define FS_API_VERSION 0
++#endif
++
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
+@@ -75,7 +83,7 @@ public:
+ 
+ 	void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override;
+ 	bool acceptsSoundFontData() override {
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ 		return true;
+ #else
+ 		return false;
+@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const char *val) {
+ 
+ // Soundfont memory loader callback functions.
+ 
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ static void *SoundFontMemLoader_open(const char *filename) {
+ 	void *p;
+ 	if (filename[0] != '&') {
+@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char *filename) {
+ 	return p;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
++#else
+ static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
++#endif
+ 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
++#else
+ static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
++#endif
+ 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
+ }
+ 
+@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
+ 	return FLUID_OK;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
++#else
+ static long SoundFontMemLoader_tell(void *handle) {
++#endif
+ 	return ((Common::SeekableReadStream *) handle)->pos();
+ }
+ #endif
+@@ -166,7 +186,8 @@ int MidiDriver_FluidSynth::open() {
+ 	if (_isOpen)
+ 		return MERR_ALREADY_OPEN;
+ 
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++
++#if FS_API_VERSION >= 0x0200
+ 	// When provided with in-memory SoundFont data, only use the configured
+ 	// SoundFont instead if it's explicitly configured on the current game.
+ 	bool isUsingInMemorySoundFontData = _engineSoundFontData && !ConfMan.getActiveDomain()->contains("soundfont");
+@@ -195,7 +216,11 @@ int MidiDriver_FluidSynth::open() {
+ 	_synth = new_fluid_synth(_settings);
+ 
+ 	if (ConfMan.getBool("fluidsynth_chorus_activate")) {
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_chorus_on(_synth, -1, 1);
++#else
+ 		fluid_synth_set_chorus_on(_synth, 1);
++#endif
+ 
+ 		int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
+ 		double chorusLevel = (double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
+@@ -210,22 +235,49 @@ int MidiDriver_FluidSynth::open() {
+ 			chorusType = FLUID_CHORUS_MOD_TRIANGLE;
+ 		}
+ 
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
++		fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
++		fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
++		fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
++		fluid_synth_set_chorus_group_type(_synth, -1, chorusType);
++#else
+ 		fluid_synth_set_chorus(_synth, chorusNr, chorusLevel, chorusSpeed, chorusDepthMs, chorusType);
++#endif
+ 	} else {
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_chorus_on(_synth, -1, 0);
++#else
+ 		fluid_synth_set_chorus_on(_synth, 0);
++#endif
+ 	}
+ 
+ 	if (ConfMan.getBool("fluidsynth_reverb_activate")) {
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_reverb_on(_synth, -1, 1);
++#else
+ 		fluid_synth_set_reverb_on(_synth, 1);
++#endif
+ 
+ 		double reverbRoomSize = (double)ConfMan.getInt("fluidsynth_reverb_roomsize") / 100.0;
+ 		double reverbDamping = (double)ConfMan.getInt("fluidsynth_reverb_damping") / 100.0;
+ 		int reverbWidth = ConfMan.getInt("fluidsynth_reverb_width");
+ 		double reverbLevel = (double)ConfMan.getInt("fluidsynth_reverb_level") / 100.0;
+ 
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_set_reverb_group_roomsize(_synth, -1, reverbRoomSize);
++		fluid_synth_set_reverb_group_damp(_synth, -1, reverbDamping);
++		fluid_synth_set_reverb_group_width(_synth, -1, reverbWidth);
++		fluid_synth_set_reverb_group_level(_synth, -1, reverbLevel);
++#else
+ 		fluid_synth_set_reverb(_synth, reverbRoomSize, reverbDamping, reverbWidth, reverbLevel);
++#endif
+ 	} else {
++#if FS_API_VERSION >= 0x0202
++		fluid_synth_reverb_on(_synth, -1, 0);
++#else
+ 		fluid_synth_set_reverb_on(_synth, 0);
++#endif
+ 	}
+ 
+ 	Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation");
+@@ -246,7 +298,7 @@ int MidiDriver_FluidSynth::open() {
+ 	const char *soundfont = !isUsingInMemorySoundFontData ?
+ 			ConfMan.get("soundfont").c_str() : Common::String::format("&%p", (void *)_engineSoundFontData).c_str();
+ 
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ 	if (isUsingInMemorySoundFontData) {
+ 		fluid_sfloader_t *soundFontMemoryLoader = new_fluid_defsfloader(_settings);
+ 		fluid_sfloader_set_callbacks(soundFontMemoryLoader,
diff --git a/games-engines/scummvm/scummvm-2.1.2.ebuild b/games-engines/scummvm/scummvm-2.1.2.ebuild
deleted file mode 100644
index 5f7022f10551..000000000000
--- a/games-engines/scummvm/scummvm-2.1.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="https://www.scummvm.org/"
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.0[sound,joystick,video]
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	jpeg? ( virtual/jpeg:0 )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	net? ( media-libs/sdl2-net )
-	opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) )
-	png? ( media-libs/libpng:0 )
-	speech? ( app-accessibility/speech-dispatcher )
-	truetype? ( media-libs/freetype:2 )
-	theora? ( media-libs/libtheora )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-fluidsynth.patch"
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# -g isn't needed for nasm here
-	sed -i \
-		-e '/NASMFLAGS/ s/-g//' \
-		configure || die
-	sed -i \
-		-e '/INSTALL.*doc/d' \
-		-e '/INSTALL.*\/pixmaps/d' \
-		-e 's/-s //' \
-		ports.mk || die
-}
-
-src_configure() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	local myconf=(
-		--backend=sdl
-		--host=${CHOST}
-		--enable-verbose-build
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--opengl-mode=$(usex opengl auto none)
-		$(use_enable a52)
-		$(use_enable aac faad)
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable !debug release-mode)
-		$(use_enable flac)
-		$(usex fluidsynth '' --disable-fluidsynth)
-		$(use_enable jpeg)
-		$(use_enable lua)
-		$(use_enable mp3 mad)
-		$(use_enable mpeg2)
-		$(use_enable net sdlnet)
-		$(use_enable png)
-		$(use_enable speech tts)
-		$(use_enable theora theoradec)
-		$(use_enable truetype freetype2)
-		$(usex unsupported --enable-all-engines '')
-		$(use_enable vorbis)
-		$(use_enable zlib)
-		$(use_enable x86 nasm)
-	)
-	echo "configure ${myconf[@]}"
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}
diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
index 93e50eddec4f..f4ab2f0515e9 100644
--- a/games-engines/scummvm/scummvm-2.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-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
@@ -20,7 +20,7 @@ RDEPEND="
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fribidi? ( dev-libs/fribidi )
 	gtk? (
 		dev-libs/glib:2
@@ -56,6 +56,7 @@ S="${WORKDIR}/${P/_/}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
+	"${FILESDIR}/${P}-fluidsynth-2.2.patch"
 )
 
 src_prepare() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-engines
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)