commit: 2225a14e34139f8d8bcdc872312dde87202ce234 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Thu Jun 9 13:47:55 2022 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Mon Jun 20 18:02:04 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2225a14e
dev-qt/qtdeclarative: add USE-flags and adjust dependencies for qt6 As requested at: https://github.com/gentoo/gentoo/pull/25635 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> dev-qt/qtdeclarative/metadata.xml | 2 ++ dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild | 17 +++++++++++++++-- dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild | 19 ++++++++++++++++--- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 19 ++++++++++++++++--- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 050837f3..aa22d78a 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -7,7 +7,9 @@ </maintainer> <use> <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> + <flag name="opengl">Enable OpenGL support</flag> <flag name="vulkan">Enable support for Vulkan</flag> + <flag name="sql">Enable QtSQL support</flag> <flag name="widgets">Enable QtWidgets support</flag> </use> <upstream> diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild index 0c20bbb9..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild index 051dcc4c..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 051dcc4c..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +}
