[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/

["Erik Mackdanz" <stasibear@gentoo.org>]

commit:     7ef595770692be0d1d14d48bcf68b8c662fdc013
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 04:54:49 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 04:55:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef59577

games-roguelike/stone-soup: Correctly use python eclasses for bdeps

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

 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 16 ++++++++++++++--
 games-roguelike/stone-soup/stone-soup-0.25.1.ebuild      | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 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-r100.ebuild
index 984eb6860bc..58a9e530e1a 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
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-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"
@@ -54,7 +54,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -70,8 +71,14 @@ PATCHES=(
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 
+	python-any-r1_pkg_setup
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."
@@ -83,6 +90,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources

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 f478d555a48..69379b34c52 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
+inherit desktop python-any-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -53,7 +53,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -69,8 +70,14 @@ PATCHES=(
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 
+	python-any-r1_pkg_setup
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."
@@ -82,6 +89,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources