gentoo resync : 15.01.2020

16 files changed, 165 insertions, 226 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 6a9c93b509b0..afad9809bfd5 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/dMagnetic/Manifest b/games-engines/dMagnetic/Manifest
index 5bfc6d69414c..8841b6c9a2d0 100644
--- a/games-engines/dMagnetic/Manifest
+++ b/games-engines/dMagnetic/Manifest
@@ -1,3 +1,3 @@
-DIST dMagnetic_0.18.tar.gz 61210 BLAKE2B 9707ea8e6545b06b998bd8cf979d45088fcbabc64553a2688fcb56b23a7d161e56276718bb73f112a4d6b3a3a6955589fd6e26cfe2bd9604c334b20acc0a74ea SHA512 0703c45f674e2bf1391d9a0c9f1c52b6fd5c6fa329c051281894df53fe1cbe84662c6489a2e10a7d6009c2a31891c3c61bf615ef2706cf98e1f4b760764ef3b5
-EBUILD dMagnetic-0.18.ebuild 693 BLAKE2B fa31754af4b32de73dc0d2e552f57047b8811c5fcfee2fde1dbbc7f2a57dcfd950edde7399d9ef36a50991f478f09594f6e6d05e55b8335508157a7784fbc860 SHA512 c61c922e9d92d57544aece587d755c93267088f9e3bc799eb0d0ffe1e86fe8a26a627c4b86624cd6c0f7611a6bee8213d6a905e4089d1b7de05e6d4f8c0af521
+DIST dMagnetic_0.19.tar.bz2 61096 BLAKE2B f22f14537252cc1e3a673e0fc647b424f9850923d922376a499a5c11b916ba90e0302e59a392c3c5a2e69503cbcae3102600c49603909251bde9a0592b4c1cec SHA512 1fff3dab5c69d227a37af68228a55f336d829f9de73c726f742190e626bde28b5d990b669d5cd17c5a02239960e06b5e04b2ffc125733b23dacb2dabb9b57675
+EBUILD dMagnetic-0.19.ebuild 710 BLAKE2B da8c91505b093f2bd7c63d109e99893d37f9b04c5b6e6f9b4ea93e654c7ba63acacf149f91fc4d76c3a9e6642fa732714ffeb4ec4b8a075e562a0aa144f55acf SHA512 017a5e987850089e64ab65c941240e3a081ff2f04a609308dad2a73c4b2fe82ab38ebe6b3e68fbbe68a69537269bc3d3bb237e8ce1529513faae551486294546
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-engines/dMagnetic/dMagnetic-0.18.ebuild b/games-engines/dMagnetic/dMagnetic-0.19.ebuild
index 24ce03974667..3459a438bbdd 100644
--- a/games-engines/dMagnetic/dMagnetic-0.18.ebuild
+++ b/games-engines/dMagnetic/dMagnetic-0.19.ebuild
@@ -8,10 +8,10 @@ inherit prefix toolchain-funcs
 MY_P="${PN}_${PV}"
 DESCRIPTION="A Magnetic Scrolls Interpreter for playing a collection of old text adventures"
 HOMEPAGE="https://www.dettus.net/dMagnetic/"
-SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~m68k ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 913df51f6e57..a5e1a7803ca0 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,4 @@
-EBUILD devilutionx-9999.ebuild 1392 BLAKE2B 6b3bb5b6795f17272b52580b8a99f0e856f781fb6fc01c02b2b0374240f7163d07712bd5380cb96c8a0b1a8811511bc5e4c3deef0c3e292646619a87311d1a8f SHA512 c35c82ac12417653521a0b9c293475a0ab7320f4ac1507ae35be7e823f7c5ae3eb1573599cccb82384f16657d042cb0d07ccf9a326f61612394b7b28de06ae19
-MISC metadata.xml 349 BLAKE2B 11288d110457dff20a74658a3405aadc17fe8acce67069fd5493f0f81e8e2aa59f45ed5808377362f6840670ae6153b199c724b2801b4689394cadb98a8061a1 SHA512 b759e6fb2533964a7226df5a5877f70eb303689f7c0fd598d1d002444ee71ac0b83747a7c8c262f2ad1d087b232de2c1c7bd3b512bbcf3469eec037009ea7f4d
+DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
+EBUILD devilutionx-1.0.0-r1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+EBUILD devilutionx-9999.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..b363bc7378ac
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 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:
+#   https://github.com/diasurgical/devilutionX/issues/490
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+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
+"
+
+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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDIST="ON"
+		-DFASTER="OFF"
+		-DLTO="$(usex lto)"
+		-DUBSAN="OFF"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+
+	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
+	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
+	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+}
+
+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/"
+	einfo "and make sure it's writeable (chmod u+w)."
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index d191d5e65931..b363bc7378ac 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ EAPI=7
 #   https://github.com/diasurgical/devilutionX/issues/490
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -19,15 +19,17 @@ if [[ "${PV}" == 9999 ]] ; then
 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"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
+	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer
 	media-libs/sdl2-ttf
@@ -37,17 +39,32 @@ 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
+}
+
 src_configure() {
 	local mycmakeargs=(
-		-DBINARY_RELEASE=ON
+		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
+		-DDIST="ON"
+		-DFASTER="OFF"
+		-DLTO="$(usex lto)"
+		-DUBSAN="OFF"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	dobin "${BUILD_DIR}/${PN}"
-	make_desktop_entry ${PN} "Diablo devolved"
+
+	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
+	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
+	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 81aca5b1e557..6f7209b5d36d 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -5,6 +5,9 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <use>
+    <flag name="lto">Build with link time optimization enabled</flag>
+  </use>
   <upstream>
     <remote-id type="github">diasurgical/devilutionX</remote-id>
   </upstream>
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 17cc5f2d648d..00fe4b6d7cb5 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,5 +1,5 @@
 AUX odamex-0.8.1-SearchDir.patch 529 BLAKE2B d4c2e996f5f3489d344b385f86b9a1cbe534365715088cbd163d5232a29ff751e2bacf2241ca2bba5c13c6acd6ca39387323edd43311c128c8050c7ddbb82f4b SHA512 336560f2305af9d6eaab889ec644d63c4af10acfe53d05c94533f1e60b27e64b560cb3fe1bfcf8996283cd152666989e2525077918c83f44b7795b131eac979a
 AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
 DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
-EBUILD odamex-0.8.1-r1.ebuild 1885 BLAKE2B 7f8b5fa772c6d0d603e98b6a6c02c029855afd2bc6c1c572a32ebc8314201589c4b74c98ded9e7ba48aca0790f6d3d82a611c502e9572b5531157fac8a11acfa SHA512 83b56eef88b27222dea2e262433c9362c932f57ed8cc1bc359a10e9602409057416f19660b9935085317ee82a4fa5019810478881e118d80ed32960a79a251ae
+EBUILD odamex-0.8.1-r1.ebuild 1855 BLAKE2B bdc225caefb90eaade4f17c01687662967654c568a9771ce4c46025c8642e01557f577241d1feb8b2c305aa9dfc604d43459e646c7b4749e2db4206a3af8962c SHA512 95f6f0238fd2adaa9066585ef70322593b847dbf44354881d124e4b37778fdc998b859020534dc56045f75b94716f0e3f5e2e837f323509b617e6fa0d7c203fa
 MISC metadata.xml 1530 BLAKE2B 03aad8e7b52331b6b2c0be004c82459219661acbce414880cb9b223eff121f9cdfabe6404309d20191b2c64f68878dc617d370d93bb6aaf4ebf74203a4b04dea SHA512 dc325607fdc57449f4fb61f56f42837a7969965f4c09f43867fa83a20783fcb9dc926b770dc587ed9e4649080c89094efe4c32ea7b55f12ec230dadb09edc6fa
diff --git a/games-engines/odamex/odamex-0.8.1-r1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild
index c823dedd980d..43af64e77527 100644
--- a/games-engines/odamex/odamex-0.8.1-r1.ebuild
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake-utils desktop prefix wxwidgets xdg
+inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
@@ -44,7 +44,7 @@ src_prepare() {
 
 	use odalaunch && setup-wxwidgets
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -57,11 +57,11 @@ src_configure() {
 		-DUSE_MINIUPNP=$(usex upnp)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# Build odamex.wad
 	cd wad || die "cd failed"
@@ -79,5 +79,5 @@ src_install() {
 		fi
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 665492d65e8b..e90ea3c288f1 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,3 @@
 DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B 85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e2222833129d64954cdcdb3af4eb4b84dc3 SHA512 b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
-EBUILD openmw-0.45.0.ebuild 3154 BLAKE2B bf428a12ad91a4955f7a1a0527e1349a662e20d7ede847593768b69b72dde3318fbef84a9be9693a243eccef5cf02a4a276b0dd9098087eab9e90a189f0ecfde SHA512 c1e0cea4f75ba6eb14b7f2172f342dc2413cc289739122cbe5d604a42e251280f788a794b510b4243c315337b5befe5c3d011c0f3b60082afda25610001ac82e
+EBUILD openmw-0.45.0.ebuild 3118 BLAKE2B f9b597b6cd0514faa4e87f108996b7f1654b9f7be479fbbcdff64fd362ec9925b93bfa2a044e1a8d1c35d498a8b1ca455d81c4cd20ee23640f76066b76b9419c SHA512 51b3cb75df98bcd9f02a607bcb3afdb09b2ad1e29c7bc9608a97ad942747650624f3f32c3df67043e013e73ef09a1a91c40b2602f299e9654ef55374e3b6dffc
 MISC metadata.xml 1044 BLAKE2B 132bf7783f4cdac33cfb9bffac4e8a0baf7380f8bb91b262c087ebab4848e6fc97dbac258d600836f1d447536077f063d0dc0ca7348179a61310806f5862ecfe SHA512 c47622fc66013a7c61b1f865619a77707b296b051df54bd75048073b6b5875d97fb300d490a5aba923cc369566ffb5f3dbab16451d1bf48f5f91de18ee7c2116
diff --git a/games-engines/openmw/openmw-0.45.0.ebuild b/games-engines/openmw/openmw-0.45.0.ebuild
index 6a6f448a3fc2..fe3b53da5e0d 100644
--- a/games-engines/openmw/openmw-0.45.0.ebuild
+++ b/games-engines/openmw/openmw-0.45.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils readme.gentoo-r1
+inherit cmake xdg-utils readme.gentoo-r1
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/"
@@ -50,7 +50,7 @@ BDEPEND="
 S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# We don't install license files
 	sed -i '/LICDIR/d' CMakeLists.txt || die
@@ -79,14 +79,14 @@ src_configure() {
 		-DDESIRED_QT_VERSION=5
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc ; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
 			-name '*.md5' -type f -delete || die
 		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
@@ -94,7 +94,7 @@ src_compile() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local DOC_CONTENTS="
 	You need the original Morrowind data files. If you haven't
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 86e1d27e8dd4..d5cfff21c75f 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,7 +1,5 @@
-AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
+AUX scummvm-2.1.0-fluidsynth.patch 1393 BLAKE2B 080c704d493d21f0e5e4387bba0bf1a2354aaccf0e96b7383f956ef89eb973cf0cdf9f60a922a8e7bd25e520a6922a1879cc5614b42731c610c2c7da64033cad SHA512 6e577087ad6d67ee45d488c762ea41d4899001a31730c47cdf263619cc079e0abd3871aa8f947f681b6d59d76094c0278bd4ed8c2439ccc4d700aa32f860c318
 AUX scummvm-2.1.0-tts_pthread_link.patch 610 BLAKE2B 7ae2613cb65f47888a668504c64196bbcb9aafa48f37e8f08cba52a21e765adb20fd9255f1218f2e3b887111587f32919cd448017543c3df303d1ed5ae1ac80c SHA512 93137b7bea5d8c6528dba3aa81b0486d64f53f57aaf975561b79a3fccc882f36f0acf327a997892b2d2c3fe1d7134cc3a3d029bd14852dbae932b07d7633da55
-DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
-EBUILD scummvm-2.0.0-r1.ebuild 2482 BLAKE2B 0ad1eae79e72b50e4f49deacaeca039d17b468a80ed10a68cf8ccc1dad424bad041de47aec35b4db5432903362d9073d1e3dc99234c5ddcb859ee596a7db60c7 SHA512 66fd6811e5b7ad4287c6aa59334eaa58be86f00b620b1222cb76d09ff75e76b3d3c1dbaccf603a0566fc46cf60921959a590e73a5d1415f34da0edc1582327f8
-EBUILD scummvm-2.1.0.ebuild 2728 BLAKE2B cd6a2e2aada44f0e4420b32dfc4e55996ba525f856a68f9546f2d169ac16afd21f2a141683dff5453ee380692956720e7f122020aca57e4d33a5cecf5c9c12fa SHA512 23d0c55d04c21cbc961f1bbe7a0b1daba44e03b22b9315a885a1ad8f3e48ee14877945faf627664aafd0548a65adc5c1e64d0bcdaa4da7467a9278846f4e578d
+EBUILD scummvm-2.1.0.ebuild 2765 BLAKE2B bfb9bddcb3c8bca3a2046e8f6e70b2c49e5cac41248689d57323013f9f15a45e0b57ef5e4b535f9848c33d8274733b4fdef1abbe15db530e3a52576e83bef2d7 SHA512 ae0c50a090892c2242d9617b6976f407dc67cafae072eed6cba951b861090863fee937a4b640e3a4744b7fa9545181b6427db10d8c9e27f3ace049ba92a5221b
 MISC metadata.xml 794 BLAKE2B 55a51df988ba376df42552e2e943f3028aba2b9125d671f026d4a47a10da79d5da49f6307aabd33aa237812a3440b8014d498794c9837b859274221832625cca SHA512 03f3a6e1554afecc3d4f57ca58ed73a5887649170872df4940ad2bcab90a7a98fde3d2de3524c528b60f37f8ecf2b463189be72057d4495c849363d97b824b83
diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e892710..000000000000
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH] Prefer pkg-config over freetype-config if possible
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- configure | 56 ++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/configure b/configure
-index 8e2a387acc..210951e343 100755
---- a/configure
-+++ b/configure
-@@ -204,6 +204,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4668,28 +4669,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
--	# Look for the freetype-config script
--	find_freetypeconfig
--
--	if test -z "$_freetypeconfig"; then
--		_freetype2=no
-+find_freetype() {
-+        # Wrapper function which tries to find freetype
-+        # either by callimg freetype-config or by using
-+        # pkg-config.
-+        # As of freetype-2.9.1 the freetype-config file
-+        # no longer gets installed by default.
-+
-+	if pkg-config --exists freetype2; then
-+		FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
-+		_freetype_found="true"
- 	else
--		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
--		# This means we can't pass it a --prefix that includes $SYSROOT.
--		freetypeprefix="$_freetypepath"
--		if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
--			teststring=VeryImplausibleSysrootX1Y2Z3
--			if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
--				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
--				freetypeprefix="${freetypeprefix##$SYSROOT}"
-+		# Look for the freetype-config script
-+		find_freetypeconfig
-+		if test -n "$_freetypeconfig"; then
-+			# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
-+			# This means we can't pass it a --prefix that includes $SYSROOT.
-+			freetypeprefix="$_freetypepath"
-+			if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
-+				teststring=VeryImplausibleSysrootX1Y2Z3
-+				if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
-+					echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
-+					freetypeprefix="${freetypeprefix##$SYSROOT}"
-+				fi
- 			fi
-+			FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
-+			FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
-+			FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null`
-+			_freetype_found="true"
- 		fi
-+	fi
-+}
- 
--		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
--		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
--
-+if test "$_freetype2" != "no"; then
-+	find_freetype
-+	if test $_freetype_found != true; then
-+		_freetype2=no
-+	else
- 		if test "$_freetype2" = "auto"; then
- 			_freetype2=no
- 
-@@ -4709,7 +4727,7 @@ EOF
- 			# required flags for static linking. We abuse this to detect
- 			# FreeType2 builds which are static themselves.
- 			if test "$_freetype2" != "yes"; then
--				FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
-+				FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS"
- 				cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
- 			fi
- 			cc_check_clean
--- 
-2.17.0
-
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
new file mode 100644
index 000000000000..6b4760e16dda
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
@@ -0,0 +1,39 @@
+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/scummvm-2.0.0-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
deleted file mode 100644
index ec9d93fc808e..000000000000
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 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 ~ppc ~ppc64 ~x86"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png 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]
-	zlib? ( sys-libs/zlib:= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.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 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 mp3 mad)
-		$(use_enable mpeg2)
-		$(use_enable png)
-		$(use_enable theora theoradec)
-		$(use_enable truetype freetype2)
-		$(usex unsupported --enable-all-engines '')
-		$(use_enable vorbis)
-		$(use_enable zlib)
-		$(use_enable x86 nasm)
-	)
-	# 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.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 6b43908481d2..06cc2f964fec 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P/_/}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-tts_pthread_link.patch"
+	"${FILESDIR}/${P}-fluidsynth.patch"
 )
 
 src_prepare() {