gentoo resync : 19.03.2019

9 files changed, 336 insertions, 170 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index a0f8abf3dcf7..81563a275aea 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
index 3b0c383fc6e7..4bf4b3cc6bd9 100644
--- a/games-engines/residualvm/Manifest
+++ b/games-engines/residualvm/Manifest
@@ -1,6 +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 1791 BLAKE2B 72cb7fe160b57c2e5d2858fd2aeb3f5b82041374f7523a64f43b69eb211c877d69898e1c2fcf15ba7111ea75ca24a14215cf0d892a65a4ccca47d2e659eed9e8 SHA512 e18cd04be84436fc4f13de9c9aaafa27f5888dfb0cc24e6713916105d515089e1ca23c7870da98138d8c2e673b8f79d54e13904b5b1966530277e485b875f661
-EBUILD residualvm-0.3.1.ebuild 2053 BLAKE2B fa9af5097bda632ae17e4b93f296ac1d0c6afa816b352d53e7d7f706350b2c6d8ade2e5b2c92ed1ce7c7950df65cca15adf590171f96bb45e5c57b2c66c73ed8 SHA512 8feedc692f14ad4e3a7ce10adaf55cb715535274cc88a32d2edd43fb3dc96ae5b751d9fc5be2fff7c030c81223f0b2a473cb3e6609ed1e6869d809cad3a047dd
-EBUILD residualvm-9999.ebuild 2053 BLAKE2B fa9af5097bda632ae17e4b93f296ac1d0c6afa816b352d53e7d7f706350b2c6d8ade2e5b2c92ed1ce7c7950df65cca15adf590171f96bb45e5c57b2c66c73ed8 SHA512 8feedc692f14ad4e3a7ce10adaf55cb715535274cc88a32d2edd43fb3dc96ae5b751d9fc5be2fff7c030c81223f0b2a473cb3e6609ed1e6869d809cad3a047dd
-MISC metadata.xml 333 BLAKE2B 37cda9e5ddf385a47b3ad7c5678bd318b79b5c6b87dab92523ad6fd44b850470eae65a01562213709c0b2f6f943c023e5892588ffe484fae12780e531c1725f0 SHA512 41e3a0c69255f5f64ff9c3806e7f1871e0721dc9554d92f370e809487975454b6747818c93da77ad2b8c579b26948ac0a48ac4bb9969838e91f48f51dae2d2f7
+EBUILD residualvm-0.3.1-r2.ebuild 2301 BLAKE2B 145d7961483d6979102a874c633d276f57f5f7a40fcb4ed0d2e7d8b6dad7d7756f080e78690fadaadc99fb0539606da79b744619edb0901da31ffb205fbf6d59 SHA512 a256d62bccff17ff1f576d18c6d2a7815d3f888119eee9a58aaae1687758036def989e750aa39464154163f397e6eccd43325a3b937dc721e54126318afbcf32
+EBUILD residualvm-9999.ebuild 2243 BLAKE2B 2cde30f89a794fa05c4558f2b9bd2e0bada8f9e9b630b6b6c66aadf1e78ccfd89e520623a5028935c0f52dab6cf172b8cf15b5d402d0b60fd78d2c53a4d0a8eb SHA512 b047bc1f6f3cd5fcb71efa7a4e166a051d2f54bfc0a81af36304add4817bcf2db69927c20a59af37414d1c478dd69e5ace91e1078cfdd2780664f63aa1f1f98d
+MISC metadata.xml 409 BLAKE2B 16d2ffcf68a4dad35833cf3f1929a1fb89811b08b6de461c7f90f02974ab04fbf7b809faac18dcabec9012607155c5dda0f7bbee54ad9863d3c9a38bc7bfc5ea SHA512 b54a3d662972aad050c3ad263de572b531b51b2d99580c2dd450d404dd5002362eaa33c40715e1055a9026680940cdc64a3b9b283dafc844be54f33848c5ea41
diff --git a/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch b/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..41468ebf2b13
--- /dev/null
+++ b/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch
@@ -0,0 +1,145 @@
+From 34fc21424803ad193532c8423049ad07131fd7db 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 1/2] BUILD: 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 | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/configure b/configure
+index 7e0c9300..0a00cd95 100755
+--- a/configure
++++ b/configure
+@@ -209,6 +209,7 @@ _sparklepath=
+ _sdlconfig=sdl2-config
+ _libcurlconfig=curl-config
+ _freetypeconfig=freetype-config
++_freetype_found="false"
+ _sdlpath="$PATH"
+ _freetypepath="$PATH"
+ _libcurlpath="$PATH"
+@@ -4529,17 +4530,45 @@ echo "$_libunity"
+ #
+ # Check for FreeType2 to be present
+ #
+-if test "$_freetype2" != "no"; then
+-
+-	# Look for the freetype-config script
+-	find_freetypeconfig
++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
++		# 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
++}
+ 
+-	if test -z "$_freetypeconfig"; then
++if test "$_freetype2" != "no"; then
++	find_freetype
++	if test $_freetype_found != true; then
+ 		_freetype2=no
+ 	else
+-		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
+-		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
+-
+ 		if test "$_freetype2" = "auto"; then
+ 			_freetype2=no
+ 
+@@ -4559,7 +4588,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.21.0
+
+From c42f90595efae54e661293832bf979f3029599fb Mon Sep 17 00:00:00 2001
+From: Bastien Bouclet <bastien.bouclet@gmail.com>
+Date: Mon, 30 Jul 2018 13:40:55 +0200
+Subject: [PATCH 2/2] BUILD: Check if pkg-config is available
+
+---
+ configure | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 0a00cd95..198c1938 100755
+--- a/configure
++++ b/configure
+@@ -3866,7 +3866,19 @@ EOF
+ cc_check -lm && append_var LIBS "-lm"
+ 
+ #
+-# Check for Ogg Vorbis
++# Check for pkg-config
++#
++echocheck "pkg-config"
++_pkg_config=no
++command -v pkg-config >/dev/null 2>&1 && _pkg_config=yes
++echo "$_pkg_config"
++
++if test "$_pkg_config" = yes && test -n "$_host" && test -z "$PKG_CONFIG_LIBDIR"; then
++	echo "WARNING: When cross-compiling PKG_CONFIG_LIBDIR must be set to the location of the .pc files for the target"
++fi
++
++#
++# Check for Ogg
+ #
+ echocheck "Ogg Vorbis"
+ if test "$_vorbis" = auto ; then
+@@ -4490,7 +4502,7 @@ define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'
+ # Check for Unity if taskbar integration is enabled
+ #
+ echocheck "libunity"
+-if test "$_unix" = no || test "$_taskbar" = no; then
++if test "$_unix" = no || test "$_taskbar" = no || test "$_pkg_config" = no; then
+ 	_libunity=no
+ else
+ if test "$_libunity" = auto ; then
+@@ -4536,8 +4548,7 @@ find_freetype() {
+         # pkg-config.
+         # As of freetype-2.9.1 the freetype-config file
+         # no longer gets installed by default.
+-
+-	if pkg-config --exists freetype2; then
++	if test "$_pkg_config" = "yes" && 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`
+-- 
+2.21.0
+
diff --git a/games-engines/residualvm/metadata.xml b/games-engines/residualvm/metadata.xml
index f346e5457981..c5d960e91c76 100644
--- a/games-engines/residualvm/metadata.xml
+++ b/games-engines/residualvm/metadata.xml
@@ -5,6 +5,9 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">residualvm</remote-id>
 	</upstream>
diff --git a/games-engines/residualvm/residualvm-0.3.1-r2.ebuild b/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..fd5eba9a2772
--- /dev/null
+++ b/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
+HOMEPAGE="http://www.residualvm.org/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/residualvm/residualvm.git"
+else
+	SRC_URI="http://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2 LGPL-2.1"
+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]
+RDEPEND="
+	media-libs/glew:0=
+	media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
+	virtual/glu
+	alsa? ( media-libs/alsa-lib )
+	jpeg? ( virtual/jpeg:0 )
+	mp3? ( media-libs/libmad )
+	mpeg2? ( media-libs/libmpeg2 )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	truetype? ( media-libs/freetype:2 )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
+src_configure() {
+	# not an autotools script
+	# some configure options currently do nothing, verify on version bump !!!
+	# disable explicitly, otherwise we get unneeded linkage (some copy-paste build system)
+	local myconf=(
+		--backend=sdl
+		--disable-faad
+		--disable-flac
+		--disable-fluidsynth
+		--disable-libunity
+		--disable-sparkle
+		--disable-tremor
+		--docdir="/usr/share/doc/${PF}"
+		--enable-all-engines
+		--enable-verbose-build
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--host="${CHOST}"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable !debug release-mode)
+		$(use_enable jpeg)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg2)
+		$(use_enable opengl)
+		$(use_enable opengl opengl-shaders)
+		$(use_enable png)
+		$(use_enable truetype freetype2)
+		$(use_enable vorbis)
+		$(use_enable zlib)
+	)
+	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
+}
+
+src_compile() {
+	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
+}
+
+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/residualvm/residualvm-0.3.1.ebuild b/games-engines/residualvm/residualvm-0.3.1.ebuild
deleted file mode 100644
index 7343afbb7e72..000000000000
--- a/games-engines/residualvm/residualvm-0.3.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/residualvm/residualvm.git"
-else
-	SRC_URI="http://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-# TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl[alsa]
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# not an autotools script
-	# most configure options currently do nothing, verify on version bump !!!
-	# disable explicitly, otherwise we get unneeded linkage (some copy-paste build system)
-	local myconf=(
-		--backend=sdl
-		--disable-debug
-		--disable-faad
-		--disable-flac
-		--disable-fluidsynth
-		--disable-libunity
-		--disable-mad
-		--disable-sparkle
-		--disable-translation
-		--disable-tremor
-		--disable-vorbis
-		--docdir="/usr/share/doc/${PF}"
-		--enable-all-engines
-		--enable-release-mode
-		--enable-zlib
-	)
-	./configure "${myconf[@]}" || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		VERBOSE_BUILD=1 \
-		AR="$(tc-getAR) cru" \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	dobin residualvm
-
-	insinto "/usr/share/${PN}"
-	doins gui/themes/modern.zip dists/engine-data/residualvm-grim-patch.lab
-
-	doicon -s scalable icons/${PN}.svg
-	doicon -s 256 icons/${PN}.png
-	domenu dists/${PN}.desktop
-
-	doman dists/${PN}.6
-	dodoc AUTHORS README.md KNOWN_BUGS TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/games-engines/residualvm/residualvm-9999.ebuild b/games-engines/residualvm/residualvm-9999.ebuild
index 7343afbb7e72..0f0a4bb4dbc3 100644
--- a/games-engines/residualvm/residualvm-9999.ebuild
+++ b/games-engines/residualvm/residualvm-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils toolchain-funcs xdg-utils
+EAPI=7
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
 HOMEPAGE="http://www.residualvm.org/"
@@ -15,77 +15,80 @@ else
 fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE=""
+IUSE="alsa debug jpeg mpeg2 mp3 opengl png truetype vorbis zlib"
 
 # TODO: fix dynamic plugin support
 # games crash without media-libs/libsdl[alsa]
 RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype:2
 	media-libs/glew:0=
-	media-libs/libpng:0=
 	media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
-	sys-libs/zlib
 	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl"
+	alsa? ( media-libs/alsa-lib )
+	jpeg? ( virtual/jpeg:0 )
+	mp3? ( media-libs/libmad )
+	mpeg2? ( media-libs/libmpeg2 )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	truetype? ( media-libs/freetype:2 )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib:= )
+"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_configure() {
 	# not an autotools script
-	# most configure options currently do nothing, verify on version bump !!!
+	# some configure options currently do nothing, verify on version bump !!!
 	# disable explicitly, otherwise we get unneeded linkage (some copy-paste build system)
 	local myconf=(
 		--backend=sdl
-		--disable-debug
 		--disable-faad
 		--disable-flac
 		--disable-fluidsynth
 		--disable-libunity
-		--disable-mad
 		--disable-sparkle
-		--disable-translation
 		--disable-tremor
-		--disable-vorbis
 		--docdir="/usr/share/doc/${PF}"
 		--enable-all-engines
-		--enable-release-mode
-		--enable-zlib
+		--enable-verbose-build
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--host="${CHOST}"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable !debug release-mode)
+		$(use_enable jpeg)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg2)
+		$(use_enable opengl)
+		$(use_enable opengl opengl-shaders)
+		$(use_enable png)
+		$(use_enable truetype freetype2)
+		$(use_enable vorbis)
+		$(use_enable zlib)
 	)
-	./configure "${myconf[@]}" || die "configure failed"
+	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
 }
 
 src_compile() {
-	emake \
-		VERBOSE_BUILD=1 \
-		AR="$(tc-getAR) cru" \
-		RANLIB=$(tc-getRANLIB)
+	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {
-	dobin residualvm
-
-	insinto "/usr/share/${PN}"
-	doins gui/themes/modern.zip dists/engine-data/residualvm-grim-patch.lab
-
-	doicon -s scalable icons/${PN}.svg
+	default
 	doicon -s 256 icons/${PN}.png
-	domenu dists/${PN}.desktop
-
-	doman dists/${PN}.6
-	dodoc AUTHORS README.md KNOWN_BUGS TODO
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 719bb82ab845..23a78401199c 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,5 @@
 AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
-DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773 SHA512 c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
-EBUILD scummvm-1.9.0.ebuild 2572 BLAKE2B 31a15a603f5b6fa33ad38da05a439e0285e4af3cf9212c8e9e403775184045a60ccff0910733ad258772420325d2395f52a54a75582f177b87bd3ad628324f0d SHA512 6d6d2bbddd94c21be730b1903f6c315a2fffe0d4ac95b41ab5cc41e08c67871a74936faaacdd49b3c2a0118caef8c7a5703ff850bc938449e233a7acfa08b606
+EBUILD scummvm-2.0.0-r1.ebuild 2593 BLAKE2B 33241fd8d519d764fe159ba8878eb54b6c82133e86c56b546e7154322640c2d52b9603986235937eb0717faa75650e3982abd4ba9a8d77a7a163cb13882a6125 SHA512 6ede107638bb458fc88ce58ca2e258fdef8afbdf6658a5ad77b174788979acf58e0a000ebd6bb92a54ab6b0dd9e0366cd69f4ea4cec455b7a34a28c16473e8c3
 EBUILD scummvm-2.0.0.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7
 MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 5e45b6299556..858b3bcc36b5 100644
--- a/games-engines/scummvm/scummvm-1.9.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs
+EAPI=7
+inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
 HOMEPAGE="http://scummvm.sourceforge.net/"
@@ -15,10 +15,13 @@ IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype u
 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 )
+	zlib? ( sys-libs/zlib:= )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
 	theora? ( media-libs/libtheora )
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
@@ -28,11 +31,16 @@ RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
 	opengl? ( virtual/opengl )
 	truetype? ( media-libs/freetype:2 )
 	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
-	x86? ( dev-lang/nasm )"
+	truetype? ( virtual/pkgconfig )
+	x86? ( dev-lang/nasm )
+"
 
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
 
 src_prepare() {
 	default
@@ -51,52 +59,52 @@ src_prepare() {
 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 \
-		--backend=sdl \
-		--host=${CHOST} \
-		--enable-verbose-build \
-		--prefix=/usr \
-		--libdir="/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) \
-		${myconf} ${EXTRA_ECONF} || die
+	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
 }
 
 src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
+	emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
 	default
 	doicon -s scalable icons/scummvm.svg
-	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }