dev-python/PyQt5: rename USE=gles2 to USE=gles2-only

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Haelwenn (lanodan) Monnier
2019-11-23 10:10:13 +01:00
committed by Andreas Sturmlechner
parent 221223ca19
commit fbc7f8b68d
3 changed files with 8 additions and 9 deletions

View File

@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
testlib webchannel webkit websockets widgets x11extras xmlpatterns"
@@ -69,7 +69,7 @@ RDEPEND="
)
declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
designer? ( >=dev-qt/designer-${QT_PV} )
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
help? ( >=dev-qt/qthelp-${QT_PV} )
location? ( >=dev-qt/qtlocation-${QT_PV} )
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
@@ -128,9 +128,9 @@ src_configure() {
$(usex declarative '' --no-qml-plugin)
$(pyqt_use_enable designer)
$(usex designer '' --no-designer-plugin)
$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
$(pyqt_use_enable gui)
$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
$(pyqt_use_enable help)
$(pyqt_use_enable location)
$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))

View File

@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
testlib webchannel webkit websockets widgets x11extras xmlpatterns"
@@ -69,7 +69,7 @@ RDEPEND="
)
declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
designer? ( >=dev-qt/designer-${QT_PV} )
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
help? ( >=dev-qt/qthelp-${QT_PV} )
location? ( >=dev-qt/qtlocation-${QT_PV} )
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
@@ -128,9 +128,9 @@ src_configure() {
$(usex declarative '' --no-qml-plugin)
$(pyqt_use_enable designer)
$(usex designer '' --no-designer-plugin)
$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
$(pyqt_use_enable gui)
$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
$(pyqt_use_enable help)
$(pyqt_use_enable location)
$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))

View File

@@ -10,7 +10,6 @@
<flag name="dbus">Build bindings for the QtDBus module</flag>
<flag name="declarative">Build bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
<flag name="gui">Build bindings for the QtGui module</flag>
<flag name="help">Build bindings for the QtHelp module</flag>
<flag name="location">Build bindings for the QtLocation module</flag>