From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AF721382C5 for ; Sat, 12 Dec 2020 04:56:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE179E0918; Sat, 12 Dec 2020 04:56:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F3D5E0918 for ; Sat, 12 Dec 2020 04:56:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2EDAC340F3A for ; Sat, 12 Dec 2020 04:56:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B152046C for ; Sat, 12 Dec 2020 04:56:09 +0000 (UTC) From: "Erik Mackdanz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" Message-ID: <1607748933.7ef595770692be0d1d14d48bcf68b8c662fdc013.stasibear@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild games-roguelike/stone-soup/stone-soup-0.25.1.ebuild X-VCS-Directories: games-roguelike/stone-soup/ X-VCS-Committer: stasibear X-VCS-Committer-Name: Erik Mackdanz X-VCS-Revision: 7ef595770692be0d1d14d48bcf68b8c662fdc013 X-VCS-Branch: master Date: Sat, 12 Dec 2020 04:56:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5d4e9ec-e5f7-45e9-a573-3d6eaa15bed5 X-Archives-Hash: 0fcdd6488f478a34e1ae6d75c233b47b commit: 7ef595770692be0d1d14d48bcf68b8c662fdc013 Author: Erik Mackdanz gentoo org> AuthorDate: Sat Dec 12 04:54:49 2020 +0000 Commit: Erik Mackdanz gentoo 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 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