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 69A4A138359 for ; Sun, 22 Nov 2020 00:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78F22E05C1; Sun, 22 Nov 2020 00:12:23 +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 52F62E05C1 for ; Sun, 22 Nov 2020 00:12:23 +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 DE46D340E3B for ; Sun, 22 Nov 2020 00:12:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62172451 for ; Sun, 22 Nov 2020 00:12:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1606003923.d0031e9954e3c20500f025edd648fe0b929aec8f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/doomsday/doomsday-2.1.1-r1.ebuild X-VCS-Directories: games-fps/doomsday/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d0031e9954e3c20500f025edd648fe0b929aec8f X-VCS-Branch: master Date: Sun, 22 Nov 2020 00:12:20 +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: c2122aea-a41f-464d-97bb-a730b7c01d2a X-Archives-Hash: b57a9b221a4985de316e47368c075574 commit: d0031e9954e3c20500f025edd648fe0b929aec8f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 22 00:09:50 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 22 00:12:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0031e99 games-fps/doomsday: Set QMAKE directly w/ qmake-utils, drop QT_SELECT Closes: https://bugs.gentoo.org/755974 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild index eb08301295e..8aa9456f575 100644 --- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild +++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild @@ -5,11 +5,12 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake python-any-r1 readme.gentoo-r1 +inherit cmake python-any-r1 qmake-utils 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 ~arm ~x86" @@ -31,8 +32,7 @@ RDEPEND=" tools? ( sys-libs/ncurses:0= ) " DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} virtual/pkgconfig " PDEPEND=" @@ -52,11 +52,11 @@ src_prepare() { } src_configure() { - export QT_SELECT=qt5 local mycmakeargs=( -DDENG_ASSIMP_EMBEDDED="OFF" -DDENG_ENABLE_TOOLS="$(usex tools)" -DPYTHON_EXECUTABLE="${PYTHON}" + -DQMAKE=$(qt5_get_bindir)/qmake ) cmake_src_configure }