commit: b17c24c3ffa4c11dcae518c63567e14e9d02da2d Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> AuthorDate: Mon Nov 16 17:35:14 2020 +0000 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> CommitDate: Mon Nov 16 17:35:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17c24c3
games-roguelike/stone-soup: Properly specify pyyaml dep Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org> Closes: https://bugs.gentoo.org/693012 Package-Manager: Portage-3.0.9, Repoman-3.0.2 games-roguelike/stone-soup/stone-soup-0.25.0.ebuild | 10 +++++++--- games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild | 6 ++++-- games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 12 ++++-------- games-roguelike/stone-soup/stone-soup-0.25.1.ebuild | 6 ++++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild index 1f9ee28db56..ae90a75c427 100644 --- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild @@ -5,8 +5,10 @@ # - attempt +test, linked bug claims to be fixed EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) VIRTUALX_REQUIRED="manual" -inherit desktop eutils xdg-utils toolchain-funcs +inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs MY_P="stone_soup-${PV}" DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" @@ -50,10 +52,12 @@ RDEPEND=" )" DEPEND="${RDEPEND} dev-lang/perl - dev-python/pyyaml + dev-python/pyyaml[${PYTHON_USEDEP}] sys-devel/flex tiles? ( - sys-libs/ncurses:0 + app-arch/advancecomp + media-gfx/pngcrush + sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild index d6a5b273ce1..5c81a6b83ce 100644 --- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild @@ -5,8 +5,10 @@ # - attempt +test, linked bug claims to be fixed EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) VIRTUALX_REQUIRED="manual" -inherit desktop eutils xdg-utils toolchain-funcs +inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs MY_P="stone_soup-${PV}" DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" @@ -50,7 +52,7 @@ RDEPEND=" )" DEPEND="${RDEPEND} dev-lang/perl - dev-python/pyyaml + dev-python/pyyaml[${PYTHON_USEDEP}] sys-devel/flex tiles? ( app-arch/advancecomp 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 2c2317541d2..50ad1d62d18 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,9 +6,10 @@ EAPI=7 -LUA_COMPAT=( lua5-1 ) +LUA_COMPAT=( lua5-{1..3} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) VIRTUALX_REQUIRED="manual" -inherit desktop eutils lua-single xdg-utils toolchain-funcs +inherit desktop distutils-r1 eutils lua-single xdg-utils toolchain-funcs MY_P="stone_soup-${PV}" DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" @@ -31,8 +32,6 @@ 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 @@ -54,11 +53,9 @@ RDEPEND=" )" DEPEND="${RDEPEND} dev-lang/perl - dev-python/pyyaml + dev-python/pyyaml[${PYTHON_USEDEP}] sys-devel/flex tiles? ( - app-arch/advancecomp - media-gfx/pngcrush sys-libs/ncurses:0 ) virtual/pkgconfig @@ -73,7 +70,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.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild index 58ccb08b806..912373c3348 100644 --- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild @@ -5,8 +5,10 @@ # - attempt +test, linked bug claims to be fixed EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) VIRTUALX_REQUIRED="manual" -inherit desktop eutils xdg-utils toolchain-funcs +inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs MY_P="stone_soup-${PV}" DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" @@ -50,7 +52,7 @@ RDEPEND=" )" DEPEND="${RDEPEND} dev-lang/perl - dev-python/pyyaml + dev-python/pyyaml[${PYTHON_USEDEP}] sys-devel/flex tiles? ( sys-libs/ncurses:0
