public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/
Date: Sun, 22 Nov 2020 00:12:20 +0000 (UTC)	[thread overview]
Message-ID: <1606003923.d0031e9954e3c20500f025edd648fe0b929aec8f.asturm@gentoo> (raw)

commit:     d0031e9954e3c20500f025edd648fe0b929aec8f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 00:09:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }


             reply	other threads:[~2020-11-22  0:12 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-22  0:12 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-08  9:56 [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/ James Le Cuirot
2024-03-25  9:21 Sam James
2024-03-25  9:21 Sam James
2023-12-19  5:19 Sam James
2022-09-19  6:42 Michał Górny
2022-06-07 23:07 James Le Cuirot
2022-06-07 23:07 James Le Cuirot
2022-06-03 12:34 Joonas Niilola
2022-02-11 23:16 Ionen Wolkens
2021-03-06  2:34 Sam James
2021-03-06  2:34 Sam James
2021-01-12 15:22 Sam James
2021-01-12 15:22 Sam James
2020-04-03 20:07 Andreas Sturmlechner
2019-09-15  9:17 Mikle Kolyada
2019-07-22  9:25 Michał Górny
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2019-05-04  9:14 James Le Cuirot
2018-04-29 17:13 Pacho Ramos
2018-04-29 17:13 Pacho Ramos
2018-04-29 17:13 Pacho Ramos
2016-11-03  9:14 Michael Palimaka
2016-11-03  9:14 Michael Palimaka
2016-05-09 18:11 Michael Sterrett
2016-04-20 15:17 Ian Stakenvicius
2016-04-07  3:23 Michael Sterrett
2016-03-06 12:58 Agostino Sarubbo
2016-01-15 19:33 Michael Sterrett
2016-01-14 21:28 Michael Sterrett
2016-01-13  6:29 Michael Sterrett
2016-01-13  6:29 Michael Sterrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1606003923.d0031e9954e3c20500f025edd648fe0b929aec8f.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox