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 901B2138359 for ; Mon, 16 Nov 2020 17:35:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACB6DE0A01; Mon, 16 Nov 2020 17:35:34 +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 7FF37E0A01 for ; Mon, 16 Nov 2020 17:35:34 +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 3D8D2335D81 for ; Mon, 16 Nov 2020 17:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B96BA3A9 for ; Mon, 16 Nov 2020 17:35:31 +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: <1605548114.b17c24c3ffa4c11dcae518c63567e14e9d02da2d.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.0.ebuild games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild 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: b17c24c3ffa4c11dcae518c63567e14e9d02da2d X-VCS-Branch: master Date: Mon, 16 Nov 2020 17:35:31 +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: 73052dce-a193-498a-a10b-5c71f09436d6 X-Archives-Hash: 2ce16735ec9c40e92cecd39c6994ce62 commit: b17c24c3ffa4c11dcae518c63567e14e9d02da2d Author: Erik Mackdanz gentoo org> AuthorDate: Mon Nov 16 17:35:14 2020 +0000 Commit: Erik Mackdanz gentoo 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 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