[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/

[Lars Wendler]

commit:     063ed5a1495c41350c0efe5464f86d7d010251b2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 06:09:29 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 06:13:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063ed5a1

games-engines/scummvm: Replaced sed call with upstream patch

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/scummvm-2.2.0-ultima_engine_lua_dep.patch    | 18 ++++++++++++++++++
 games-engines/scummvm/scummvm-2.2.0.ebuild             |  9 ++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git 
a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch 
b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
new file mode 100644
index 00000000000..d73ad03820e
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
@@ -0,0 +1,18 @@
+From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
+From: Paul Gilbert <dreammas...@scummvm.org>
+Date: Wed, 23 Sep 2020 19:10:17 -0700
+Subject: [PATCH] ULTIMA: Add lua as an engine dependency
+
+---
+ engines/ultima/configure.engine | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
+index 6447e3eb7f96..704a79d1f61f 100644
+--- a/engines/ultima/configure.engine
++++ b/engines/ultima/configure.engine
+@@ -1,3 +1,3 @@
+ # This file is included from the main "configure" script
+ # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
++add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"

diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild 
b/games-engines/scummvm/scummvm-2.2.0.ebuild
index 2c3d39e3e7a..93e50eddec4 100644
--- a/games-engines/scummvm/scummvm-2.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0.ebuild
@@ -54,6 +54,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P/_/}"
 
+PATCHES=(
+       "${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
+)
+
 src_prepare() {
        xdg_src_prepare
 
@@ -66,11 +70,6 @@ src_prepare() {
                -e '/INSTALL.*\/pixmaps/d' \
                -e 's/-s //' \
                ports.mk || die
-
-       # Without lua linking of ultima engine fails
-       # Please remove with next version bump!!!
-       sed '/^add_engine/s@"$@ lua"@' \
-               -i engines/ultima/configure.engine || die
 }
 
 src_configure() {