[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     d39f8df3f36c900a2e7dd03818cf2bcf39facf82
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 18:46:50 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 20:06:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39f8df3

dev-python/PyQt6: fix build with qtbase[-opengl]

On top of disabling the QtOpenGL bindings with USE=-opengl,
also need to fully disable the OpenGL feature given it's
also used in QtGui.

Still not sure if this is all handled right for gles2-only,
the logic is misleading.

Closes: https://bugs.gentoo.org/904676
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-python/PyQt6/PyQt6-6.4.2.ebuild | 1 +
 dev-python/PyQt6/PyQt6-6.5.0.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-python/PyQt6/PyQt6-6.4.2.ebuild b/dev-python/PyQt6/PyQt6-6.4.2.ebuild
index a330813b3bbe..b7539614ad4a 100644
--- a/dev-python/PyQt6/PyQt6-6.4.2.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.4.2.ebuild
@@ -135,6 +135,7 @@ src_configure() {
 		$(usev !qml --no-qml-plugin)
 
 		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !opengl --disabled-feature=PyQt_OpenGL)
 		$(usev !ssl --disabled-feature=PyQt_SSL)
 	)
 }

diff --git a/dev-python/PyQt6/PyQt6-6.5.0.ebuild b/dev-python/PyQt6/PyQt6-6.5.0.ebuild
index cc79a2b35f27..4b7e6d33b9e8 100644
--- a/dev-python/PyQt6/PyQt6-6.5.0.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.0.ebuild
@@ -137,6 +137,7 @@ src_configure() {
 		$(usev !qml --no-qml-plugin)
 
 		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !opengl --disabled-feature=PyQt_OpenGL)
 		$(usev !ssl --disabled-feature=PyQt_SSL)
 	)
 }