From ece690af8461aa91b830280e8fc080ca288b49f9 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Thu, 24 Aug 2023 07:54:03 -0400 Subject: [PATCH] dev-qt/qt5compat: tighten deps a bit (qt6) * qtbase[icu=]: links directly with it depending on qtbase, so we need to match and bind := for rebuilds * qtbase[xml]: bug #911927 * IUSE=qml: can be optional, and will also use shadertools with qml is found In theory we could add IUSE="gui xml" too but not convinced it's worth worrying about on a compat library, imagine roughly all revdeps will need IUSE="gui" too (unlike qml). Closes: https://bugs.gentoo.org/911927 Signed-off-by: Ionen Wolkens --- dev-qt/qt5compat/metadata.xml | 3 +++ ...-6.5.2.ebuild => qt5compat-6.5.2-r1.ebuild} | 18 ++++++++++++++++-- dev-qt/qt5compat/qt5compat-6.5.9999.ebuild | 18 ++++++++++++++++-- dev-qt/qt5compat/qt5compat-6.9999.ebuild | 18 ++++++++++++++++-- 4 files changed, 51 insertions(+), 6 deletions(-) rename dev-qt/qt5compat/{qt5compat-6.5.2.ebuild => qt5compat-6.5.2-r1.ebuild} (57%) diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml index 61563214f4862..00a322d647f6d 100644 --- a/dev-qt/qt5compat/metadata.xml +++ b/dev-qt/qt5compat/metadata.xml @@ -5,6 +5,9 @@ qt@gentoo.org Gentoo Qt Project + + Build QML/QtQuick bindings and imports + https://bugreports.qt.io/ https://doc.qt.io/ diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild similarity index 57% rename from dev-qt/qt5compat/qt5compat-6.5.2.ebuild rename to dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild index 774e6a1a99c68..4a08020e992c2 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild @@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="icu qml" + RDEPEND=" - =dev-qt/qtbase-${PV}*:6[gui,network] - =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + ) " DEPEND="${RDEPEND}" +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + src_test() { # tst_qxmlinputsource sometimes hang without -j1 qt6-build_src_test -j1 diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild index 774e6a1a99c68..4a08020e992c2 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild @@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="icu qml" + RDEPEND=" - =dev-qt/qtbase-${PV}*:6[gui,network] - =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + ) " DEPEND="${RDEPEND}" +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + src_test() { # tst_qxmlinputsource sometimes hang without -j1 qt6-build_src_test -j1 diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild index 774e6a1a99c68..4a08020e992c2 100644 --- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild @@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="icu qml" + RDEPEND=" - =dev-qt/qtbase-${PV}*:6[gui,network] - =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + ) " DEPEND="${RDEPEND}" +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + src_test() { # tst_qxmlinputsource sometimes hang without -j1 qt6-build_src_test -j1