7 files changed, 140 insertions, 15 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index a4c35d9e4e16..25196142dd21 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
index 4bf4b3cc6bd9..19fc9cd7736e 100644
--- a/games-engines/residualvm/Manifest
+++ b/games-engines/residualvm/Manifest
@@ -3,5 +3,5 @@ DIST residualvm-0.2.1-sources.tar.bz2 5533814 BLAKE2B befcb42c823d31ff1e8793d0c9
 DIST residualvm-0.3.1-sources.tar.bz2 6711799 BLAKE2B 93d21bc5ee2c567b1ef256a69a2634761cd52211a0b2d926edc67b65e0cc1bf23b41c91225e6d43990d61e6c3761acf19defaa9b477ad882d332ad77c71af1a6 SHA512 491a77f1775718795d93f099fa39ec5888755ac1df610089c17209334b98ae783271078ed03a61ced09835aa327446804a55522d4b83f618dd3b843c231444a0
 EBUILD residualvm-0.2.1-r1.ebuild 1791 BLAKE2B 72cb7fe160b57c2e5d2858fd2aeb3f5b82041374f7523a64f43b69eb211c877d69898e1c2fcf15ba7111ea75ca24a14215cf0d892a65a4ccca47d2e659eed9e8 SHA512 e18cd04be84436fc4f13de9c9aaafa27f5888dfb0cc24e6713916105d515089e1ca23c7870da98138d8c2e673b8f79d54e13904b5b1966530277e485b875f661
 EBUILD residualvm-0.3.1-r2.ebuild 2301 BLAKE2B 145d7961483d6979102a874c633d276f57f5f7a40fcb4ed0d2e7d8b6dad7d7756f080e78690fadaadc99fb0539606da79b744619edb0901da31ffb205fbf6d59 SHA512 a256d62bccff17ff1f576d18c6d2a7815d3f888119eee9a58aaae1687758036def989e750aa39464154163f397e6eccd43325a3b937dc721e54126318afbcf32
-EBUILD residualvm-9999.ebuild 2243 BLAKE2B 2cde30f89a794fa05c4558f2b9bd2e0bada8f9e9b630b6b6c66aadf1e78ccfd89e520623a5028935c0f52dab6cf172b8cf15b5d402d0b60fd78d2c53a4d0a8eb SHA512 b047bc1f6f3cd5fcb71efa7a4e166a051d2f54bfc0a81af36304add4817bcf2db69927c20a59af37414d1c478dd69e5ace91e1078cfdd2780664f63aa1f1f98d
+EBUILD residualvm-9999.ebuild 2136 BLAKE2B e13c159ad425d3413423cda03c0a3eb403208354f5b539bbb3ebf19a1c49fbf67bf30f554c6db8be9e27061257ba762d2ee99159d3018acbbb716f74caa99d01 SHA512 9489c5c76b2b8acb1d56b868152415ecd796bdf84e84b40206dea8475bd1387c353d700546f903de93316ff1f6479d670700e74f52e4845d4015dae9e2766b74
 MISC metadata.xml 409 BLAKE2B 16d2ffcf68a4dad35833cf3f1929a1fb89811b08b6de461c7f90f02974ab04fbf7b809faac18dcabec9012607155c5dda0f7bbee54ad9863d3c9a38bc7bfc5ea SHA512 b54a3d662972aad050c3ad263de572b531b51b2d99580c2dd450d404dd5002362eaa33c40715e1055a9026680940cdc64a3b9b283dafc844be54f33848c5ea41
diff --git a/games-engines/residualvm/residualvm-9999.ebuild b/games-engines/residualvm/residualvm-9999.ebuild
index 0f0a4bb4dbc3..da2087300c2d 100644
--- a/games-engines/residualvm/residualvm-9999.ebuild
+++ b/games-engines/residualvm/residualvm-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="alsa debug jpeg mpeg2 mp3 opengl png truetype vorbis zlib"
 
 # TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl[alsa]
+# games crash without media-libs/libsdl2[alsa]
 RDEPEND="
 	media-libs/glew:0=
 	media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
@@ -80,15 +80,3 @@ src_install() {
 	default
 	doicon -s 256 icons/${PN}.png
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index a5968c39b34e..1ba68153a301 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,7 @@
 AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
+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
-MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
+EBUILD scummvm-2.1.0.ebuild 2716 BLAKE2B c9724c5e57a55e96731f202564a070f22dd4092ba470a7bcbea58647ae03c8fa81c7915d7aeb1a38c19fd8bdf5316eb5693b01df6aec8e2258f49cf5e5118e11 SHA512 9de96a87d604e8df29c26d79c419fe9950a017f4554ec223771f11b38926bf33edd31ee9d2ffd8e3470caf7a005d2c07040c21832ff017d6fb384777ab748aec
+MISC metadata.xml 794 BLAKE2B 55a51df988ba376df42552e2e943f3028aba2b9125d671f026d4a47a10da79d5da49f6307aabd33aa237812a3440b8014d498794c9837b859274221832625cca SHA512 03f3a6e1554afecc3d4f57ca58ed73a5887649170872df4940ad2bcab90a7a98fde3d2de3524c528b60f37f8ecf2b463189be72057d4495c849363d97b824b83
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
new file mode 100644
index 000000000000..70440be0e13a
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
@@ -0,0 +1,22 @@
+From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001
+From: Christian Krause <chkr@plauener.de>
+Date: Wed, 16 Oct 2019 22:41:27 +0200
+Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 0adf0bb7bad..dbfe336e6d0 100755
+--- a/configure
++++ b/configure
+@@ -5504,7 +5504,7 @@ else
+ 		echo "linux"
+ 		_tts=yes
+ 		define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
+-		append_var LIBS '-lspeechd'
++		append_var LIBS '-lspeechd -lpthread'
+ 		;;
+ 	mingw*)
+ 		echo "win32"
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index 3f7ace82af07..5ccc7bb685e0 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -8,6 +8,8 @@
   <use>
     <flag name="fluidsynth">compile with support for fluidsynth</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
+    <flag name="net">enable cloud support via <pkg>media-libs/sdl2-net</pkg></flag>
+    <flag name="speech">enable text-to-speech support through <pkg>app-accessibility/speech-dispatcher</pkg></flag>
     <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
   </use>
   <upstream>
diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild
new file mode 100644
index 000000000000..fa2a0700cccb
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -0,0 +1,110 @@
+# 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 ~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 )
+	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}/${P}-tts_pthread_link.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
+}