commit:     7f4de71f7e2b01a1f6ac2ab383a16d7f4f74495b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 16:54:44 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 16:54:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4de71f

games-roguelike/stone-soup: Add missing bdeps pngcrush+advpng

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 ...ne-soup-0.25.1-r100.ebuild => stone-soup-0.25.1-r1.ebuild} | 11 ++++-------
 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild      |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
similarity index 95%
copy from games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
copy to games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
index 449552e96b5..d6a5b273ce1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -5,10 +5,8 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils lua-single xdg-utils toolchain-funcs
+inherit desktop eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting 
in dungeons"
@@ -31,11 +29,9 @@ IUSE="debug ncurses sound test +tiles"
 # see https://crawl.develz.org/mantis/view.php?id=6121
 RESTRICT="test"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
 RDEPEND="
-       ${LUA_DEPS}
        dev-db/sqlite:3
+       =dev-lang/lua-5.1*:0=
        sys-libs/zlib
        !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
        ncurses? ( sys-libs/ncurses:0 )
@@ -57,6 +53,8 @@ DEPEND="${RDEPEND}
        dev-python/pyyaml
        sys-devel/flex
        tiles? (
+               app-arch/advancecomp
+               media-gfx/pngcrush
                sys-libs/ncurses:0
        )
        virtual/pkgconfig
@@ -71,7 +69,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-       lua-single_pkg_setup
 
        if use !ncurses && use !tiles ; then
                ewarn "Neither ncurses nor tiles frontend"

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
index 449552e96b5..2c2317541d2 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-1 )
 VIRTUALX_REQUIRED="manual"
 inherit desktop eutils lua-single xdg-utils toolchain-funcs
 
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
        dev-python/pyyaml
        sys-devel/flex
        tiles? (
+               app-arch/advancecomp
+               media-gfx/pngcrush
                sys-libs/ncurses:0
        )
        virtual/pkgconfig

Reply via email to