public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyotherside/
Date: Wed, 28 Jun 2023 08:29:53 +0000 (UTC)	[thread overview]
Message-ID: <1687940983.62f95c31cdb8d88663522dad41d574b79d91fc09.marecki@gentoo> (raw)

commit:     62f95c31cdb8d88663522dad41d574b79d91fc09
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 08:23:34 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 08:29:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f95c31

dev-python/pyotherside: allow building against Qt6

Technically, USE=qt6 should still be masked on this package
- but it seems the global "-qt6" for arch/amd64 overrides this.

To be confirmed that this actually builds.

Bug: https://bugs.gentoo.org/909274
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-python/pyotherside/pyotherside-1.6.0.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-python/pyotherside/pyotherside-1.6.0.ebuild b/dev-python/pyotherside/pyotherside-1.6.0.ebuild
index 09ccc8660fa9..41263ea70ea1 100644
--- a/dev-python/pyotherside/pyotherside-1.6.0.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.6.0.ebuild
@@ -20,8 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( qt5 qt6 )"
 
 # qt6 TODO:
-#  - add dev-qt/qt{gui,opengl}:6 once in the tree, test if qt6 deps okay then
-#  - instrument qmake6 (no eqmake6 in the eclass yet)
+#  - check if all qt6 deps are okay yet
 #  - multibuild for both qt5 and qt6 if requested
 RDEPEND="
 	${PYTHON_DEPS}
@@ -33,7 +32,7 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 	qt6? (
-		dev-qt/qtbase:6
+		dev-qt/qtbase:6[opengl]
 		dev-qt/qtdeclarative:6
 		dev-qt/qtsvg:6
 	)"
@@ -48,7 +47,7 @@ src_configure() {
 	if use qt5; then
 		eqmake5
 	elif use qt6; then
-		die "Qt6 support is not ready yet"
+		eqmake6
 	else
 		# This should never happen if REQUIRED_USE is enforced
 		die "Neither Qt5 nor Qt6 support enabled, aborting"


             reply	other threads:[~2023-06-28  8:29 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28  8:29 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-28  8:19 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyotherside/ Andreas Sturmlechner
2025-02-16  3:31 Michał Górny
2024-06-28 11:38 Michał Górny
2024-05-19  6:02 Michał Górny
2024-03-05 13:27 Marek Szuba
2024-03-05 13:27 Marek Szuba
2024-03-05 13:27 Marek Szuba
2023-06-04 15:49 Arthur Zamarin
2022-08-07 15:39 David Seifert
2021-12-31  1:15 Georgy Yakovlev
2021-09-13 16:26 Marek Szuba
2021-09-13 16:26 Marek Szuba
2021-09-10  8:56 Marek Szuba
2021-08-10  0:22 Göktürk Yüksek
2021-07-29 12:08 David Seifert
2021-02-15  2:19 Rick Farina
2020-03-28 18:03 Michał Górny
2020-03-19  2:11 Rick Farina
2019-10-24 15:02 Göktürk Yüksek
2019-10-11 20:50 Göktürk Yüksek
2019-07-26 17:54 Göktürk Yüksek
2019-02-01  3:00 Göktürk Yüksek
2019-02-01  3:00 Göktürk Yüksek
2017-11-24 23:09 Michael Palimaka
2017-11-21 18:08 Manuel Rüger
2017-10-16 19:35 Manuel Rüger
2017-08-01 12:03 Manuel Rüger

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=1687940983.62f95c31cdb8d88663522dad41d574b79d91fc09.marecki@gentoo \
    --to=marecki@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