From 95ee185b2a5731511d381803e9c269b523bbf8b1 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 4 May 2019 09:38:41 +0100 Subject: [PATCH] games-fps/doomsday: Switch to python-any-r1 and allow Python 3 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: James Le Cuirot --- games-fps/doomsday/doomsday-2.1.1.ebuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild index def51c66cb8e..31b010dcafaf 100644 --- a/games-fps/doomsday/doomsday-2.1.1.ebuild +++ b/games-fps/doomsday/doomsday-2.1.1.ebuild @@ -3,20 +3,17 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) -inherit cmake-utils python-r1 readme.gentoo-r1 +inherit cmake-utils python-any-r1 readme.gentoo-r1 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" HOMEPAGE="https://www.dengine.net" SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz" - LICENSE="GPL-3+ LGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="demo fmod freedoom fluidsynth openal tools" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-qt/qtcore:5= @@ -62,7 +59,7 @@ src_prepare() { sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die } -internal_src_configure() { +src_configure() { export QT_SELECT=qt5 local mycmakeargs=( -DDENG_ASSIMP_EMBEDDED="OFF" @@ -72,10 +69,6 @@ internal_src_configure() { cmake-utils_src_configure } -src_configure() { - python_foreach_impl internal_src_configure -} - src_install() { cmake-utils_src_install -- 2.26.2