summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Mackdanz <stasibear@gentoo.org>2020-12-12 07:51:11 -0600
committerErik Mackdanz <stasibear@gentoo.org>2020-12-12 07:51:11 -0600
commit7542a3cf9697be8b69c850961d644e6d52954dae (patch)
treee94bd3c87d9796ec8ff1f1bc929fd04222001f8e /games-roguelike
parentdev-libs/libusb: Fixed build/install with USE="doc" (diff)
downloadgentoo-7542a3cf9697be8b69c850961d644e6d52954dae.tar.gz
gentoo-7542a3cf9697be8b69c850961d644e6d52954dae.tar.bz2
gentoo-7542a3cf9697be8b69c850961d644e6d52954dae.zip
games-roguelike/stone-soup: Correctly use python eclasses for bdeps
Had omitted this version in previous fix. Closes: https://bugs.gentoo.org/759583 Closes: https://bugs.gentoo.org/693012 Signed-off-by: Erik Mackdanz <stasibear@gentoo.org> Package-Manager: Portage-3.0.12, Repoman-3.0.2
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild20
1 files changed, 16 insertions, 4 deletions
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 d4d2ba19807a..8a4d1201dc17 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
@@ -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"
@@ -42,8 +42,8 @@ RDEPEND="
media-libs/freetype:2
media-libs/libpng:0
sound? (
- media-libs/libsdl2[X,opengl,sound,video]
- media-libs/sdl2-mixer
+ media-libs/libsdl2[X,opengl,sound,video]
+ media-libs/sdl2-mixer
)
!sound? ( media-libs/libsdl2[X,opengl,video] )
media-libs/sdl2-image[png]
@@ -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? (
app-arch/advancecomp
@@ -71,8 +72,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."
@@ -84,6 +91,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