[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     19cba80e727f3f11398627961455cf0a64226dea
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 14:04:18 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 15:58:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cba80e

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index fdf00d0e0369..23836162a90d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -45,7 +45,7 @@ IUSE="
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+QT_PV=6.5.4:6
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
@@ -53,7 +53,12 @@ COMMON_DEPEND="
        >=dev-qt/qt5compat-${QT_PV}
        >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
        >=dev-qt/qtdeclarative-${QT_PV}=
-       clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
+       clang? (
+               $(llvm_gen_dep '
+                       sys-devel/clang:${LLVM_SLOT}=
+                       sys-devel/llvm:${LLVM_SLOT}=
+               ')
+       )
        designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
        help? (
                >=dev-qt/qttools-${QT_PV}[assistant]
@@ -141,12 +146,13 @@ src_configure() {
        use elibc_musl && append-lfs-flags
 
        local mycmakeargs=(
+               -DBUILD_DEVELOPER_DOCS=$(usex doc)
+               -DBUILD_DOCS_BY_DEFAULT=$(usex doc)
                -DBUILD_WITH_PCH=no
                -DWITH_DOCS=$(usex doc)
-               -DBUILD_DEVELOPER_DOCS=$(usex doc)
                -DWITH_TESTS=$(usex test)
 
-               # TODO: try unbundling now that slot 6 exists+unmasked (bug 
#934462)
+               # sticking to bundled for now until it switches to KF6's
                -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
                # Much can be optional, but do not want to flood users (or 
maintainers)
@@ -206,12 +212,6 @@ src_test() {
        cmake_src_test --label-exclude exclude_from_precheck
 }
 
-src_compile() {
-       cmake_src_compile
-
-       use doc && cmake_build {qch,html}_docs
-}
-
 src_install() {
        cmake_src_install