commit: 41dd954489280c04c1d8c9cf1fcfb0c612835ec6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 4 19:51:17 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:01:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dd9544
dev-qt/qttools: depend on qtbase[gles2-only=] for qtdiag
Same as opengl and vulkan, qtdiag has the whole slew of
QT_CONFIG that would break if qtbase disables support.
Albeit unfortunate with unsplit qttools given USE is a
no-op (like vulkan) unless qtdiag is enabled.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qttools/qttools-6.5.2-r1.ebuild | 8 ++++----
dev-qt/qttools/qttools-6.5.9999.ebuild | 8 ++++----
dev-qt/qttools/qttools-6.9999.ebuild | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- assistant clang designer distancefieldgenerator +linguist
- opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
- qtplugininfo vulkan +widgets
+ assistant clang designer distancefieldgenerator gles2-only
+ +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+ qtdiag qtplugininfo vulkan +widgets
"
# note that some tools do not *require* widgets but will skip a sub-tool
# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
- qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+ qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
"
DEPEND="${RDEPEND}"
diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild
b/dev-qt/qttools/qttools-6.5.9999.ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6.5.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.5.9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- assistant clang designer distancefieldgenerator +linguist
- opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
- qtplugininfo vulkan +widgets
+ assistant clang designer distancefieldgenerator gles2-only
+ +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+ qtdiag qtplugininfo vulkan +widgets
"
# note that some tools do not *require* widgets but will skip a sub-tool
# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
- qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+ qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
"
DEPEND="${RDEPEND}"
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild
b/dev-qt/qttools/qttools-6.9999.ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- assistant clang designer distancefieldgenerator +linguist
- opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
- qtplugininfo vulkan +widgets
+ assistant clang designer distancefieldgenerator gles2-only
+ +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+ qtdiag qtplugininfo vulkan +widgets
"
# note that some tools do not *require* widgets but will skip a sub-tool
# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
- qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+ qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
"
DEPEND="${RDEPEND}"
