gentoo auto-resync : 14:11:2024 - 03:02:32

16 files changed, 165 insertions, 19 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index cd81f3a30c07..c8471152c66b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 4184c5de4d3e..4ff68196a094 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,8 +1,9 @@
 AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4
 AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf5da4523c347f963c3459efdd9a716387690775f96abe0bb60bf0e147dd01ded79a110d1222b4009b17cece71998b46d62dd8b83eeac6 SHA512 6a0807bab971a795a156f974dab2b12699a4c90a6c7380e2dd0a136ba44354791ef7a178f79e61100c3165ec7667a72d6ca7f3c43f4958ccf9e8611995ca191d
 AUX qt-creator-14.0.1-clang19.patch 1046 BLAKE2B 2d1fefe8c48d448d51ca5c25e5f91cc178300312e8f420055a15e0bfecf5d916244460bbc6d9acff738116f3a2e272a7ab758bd6cf5884286e5e8013a2801656 SHA512 39e164ba1efe0b6fea70ec8ff62f0f46fa376f1ee85e450c67da1f6ba5ed00d571f94b4976be4b4f1e87ffcf56a5585761a5a1a319df67d17a56a13061e1303f
+AUX qt-creator-14.0.2-qt681.patch 6003 BLAKE2B 2243b5779a6948308367430528b183c4981f634481cd161b1c2ea45980c0b81ee409e8705965bc6ebbe91e6779f7c67cc6674ddc381c0c83c0829ae18d1ca621 SHA512 973bf5df6ad1e781ad6b44eef2c988ece636e7b57554f8ef4ecb43f6577c824c8e0669ae89cc6e4ebdcafdf592e235841844d4cbe3b350f8b463a41e5b3c66cd
 AUX qt-creator-15.0.0-musl-no-execinfo.patch 1313 BLAKE2B acbc23f4e943f1d5942b8f91e75acefb24d8d396a37d15965892ef6da60891c92824628d1e719762273c5fce6752812b6d50a18b4536484c8e20cd9d5100ea62 SHA512 644c7f8337a8a7c66fbcea9f2d097ba508eea9b7a3550bcf4b3dfc267c14d5c2b9d517c0ff092aa101fd902b98af44133ac81f1ba1a5fdbe1251dda45677447d
 DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f SHA512 45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
-EBUILD qt-creator-14.0.2.ebuild 7713 BLAKE2B d6f2d4ad0fa57fa12ef35cc32e82d39934a95016cee2db477aac61f57da86df230cccefc9d324cf0dc1e897708699cc0ae9c4d780c90153d3e929e48933e6d9f SHA512 778b16724ba1f7124feb07265418986347ee3a254b9960ce783214c7c62247d416b0ef1ddb4b426f804ca9e0f0f14de3512d9108f717ce1a7a6ea214f4268728
+EBUILD qt-creator-14.0.2.ebuild 7753 BLAKE2B 59bda93c6f931b37f782d6fce8abbd4d7bb22c71300a9121a52cdaf69141e624d04ff4dcc99b62137ca02944e9a96ac0326e257039e00d8030b19381f23e3d75 SHA512 5aebad9c4b6b87380db5ceca2cac143ddda085b5da007f313244c808f9b33b5c536ad8f92eebbbfe7c18a57398d666312277a660f481a1896c301e5c46dd0e89
 EBUILD qt-creator-9999.ebuild 8286 BLAKE2B 8e006b482d2e74621adf1e7cae1ae6e2ccb2c4a09678a69dce01f32849c5704c6997633db3eca5299b85729b2ee06ae2774da2aac69051e63002a1f28ca313e3 SHA512 f85cd2344eee23fd07d9f496567f68654112921490b9fc5dac914dc74f63992fcfb84e36862d212638f0355f043d55a029becab55bf1ee3d996844c0ee9bb535
 MISC metadata.xml 1273 BLAKE2B 3c4e41b9422bad858fae48bdc9814c7e259dcea2d1da6c383a54f809152d77f72438e05115463866bea7f87a9d79301ba65bbaa7e0fd3d2255b5fdfcc58a9a78 SHA512 a830e418863904943cd33deb4f09fbd98557502ccd37137d891957ee1883fe80b9a8091cdcb0d93c4d74c343ffdae9721ecc56414d0b2b9c7b79984687f07cf1
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
new file mode 100644
index 000000000000..0dbe75feb7c4
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
@@ -0,0 +1,141 @@
+Backport of [1]+[2] to fix tests with Qt6.8.0 and build with Qt6.8.1.
+
+There was some refactoring in these files which prevent anything from
+applying cleanly, so this was manually rebased -- hopefully correct
+(fsengine tests pass again, so it should be fine).
+
+[1] https://github.com/qt-creator/qt-creator/commit/81d4e8a3742
+[2] https://github.com/qt-creator/qt-creator/commit/f993fb76ded
+--- a/src/libs/utils/fsengine/diriterator.h
++++ b/src/libs/utils/fsengine/diriterator.h
+@@ -16,4 +16,36 @@
+ namespace Internal {
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
++inline std::pair<QDir::Filters, QDirIterator::IteratorFlags> convertQDirListingIteratorFlags(
++    QDirListing::IteratorFlags flags)
++{
++    QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::System | QDir::NoDotAndDotDot;
++    QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags;
++
++    if (flags & QDirListing::IteratorFlag::ExcludeFiles)
++        filters.setFlag(QDir::Files, false);
++    if (flags & QDirListing::IteratorFlag::ExcludeDirs)
++        filters.setFlag(QDir::Dirs, false);
++    if (flags & QDirListing::IteratorFlag::ExcludeSpecial)
++        filters.setFlag(QDir::System, false);
++    if (flags & QDirListing::IteratorFlag::CaseSensitive)
++        filters.setFlag(QDir::CaseSensitive, true);
++    if (flags & QDirListing::IteratorFlag::IncludeHidden)
++        filters.setFlag(QDir::Hidden, true);
++
++    if (flags & QDirListing::IteratorFlag::IncludeDotAndDotDot) {
++        filters.setFlag(QDir::NoDot, false);
++        filters.setFlag(QDir::NoDotDot, false);
++    }
++
++    if (flags & QDirListing::IteratorFlag::Recursive)
++        iteratorFlags.setFlag(QDirIterator::Subdirectories, true);
++    if (flags & QDirListing::IteratorFlag::FollowDirSymlinks)
++        iteratorFlags.setFlag(QDirIterator::FollowSymlinks, true);
++
++    return {filters, iteratorFlags};
++}
++#endif
++
+ class DirIterator : public QAbstractFileEngineIterator
+ {
+--- a/src/libs/utils/fsengine/fixedlistfsengine.h
++++ b/src/libs/utils/fsengine/fixedlistfsengine.h
+@@ -67,8 +67,14 @@
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-    IteratorUniquePtr beginEntryList(const QString &path,
+-                                     QDir::Filters filters,
+-                                     const QStringList &filterNames) override
++    QAbstractFileEngine::IteratorUniquePtr beginEntryList(
++        const QString &path,
++        QDirListing::IteratorFlags itFlags,
++        const QStringList &filterNames) override
+     {
++        // We do not support recursive or following symlinks for the Fixed List engine.
++        Q_ASSERT(itFlags.testFlag(QDirListing::IteratorFlag::Recursive) == false);
++
++        const auto [filters, _] = convertQDirListingIteratorFlags(itFlags);
++
+         return std::make_unique<DirIterator>(m_children, path, filters, filterNames);
+     }
+--- a/src/libs/utils/fsengine/fsengine_impl.cpp
++++ b/src/libs/utils/fsengine/fsengine_impl.cpp
+@@ -297,11 +297,25 @@
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(const QString &path,
+-                                                                    QDir::Filters filters,
+-                                                                    const QStringList &filterNames)
++QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(
++    const QString &path, QDirListing::IteratorFlags itFlags, const QStringList &filterNames)
++{
++    const auto [filters, iteratorFlags] = convertQDirListingIteratorFlags(itFlags);
++
++    FilePaths paths{m_filePath.pathAppended(".")};
++    m_filePath.iterateDirectory(
++        [&paths](const FilePath &p, const FilePathInfo &fi) {
++            paths.append(p);
++            FilePathInfoCache::CachedData *data
++                = new FilePathInfoCache::CachedData{fi, QDateTime::currentDateTime().addSecs(60)};
++            g_filePathInfoCache.cache(p, data);
++            return IterationPolicy::Continue;
++        },
++        {filterNames, filters, iteratorFlags});
++
++    return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
++}
+ #else
+ QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filters,
+                                                             const QStringList &filterNames)
+-#endif
+ {
+     FilePaths paths{m_filePath.pathAppended(".")};
+@@ -317,10 +331,7 @@
+         {filterNames, filters});
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-    return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
+-#else
+     return new DirIterator(std::move(paths));
+-#endif
+ }
++#endif
+ 
+ qint64 FSEngineImpl::read(char *data, qint64 maxlen)
+--- a/src/libs/utils/fsengine/fsengine_impl.h
++++ b/src/libs/utils/fsengine/fsengine_impl.h
+@@ -60,7 +60,10 @@
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-    IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
+-                                     const QStringList &filterNames) override;
+-    IteratorUniquePtr endEntryList() override { return {}; }
++    IteratorUniquePtr beginEntryList(
++        const QString &path,
++        QDirListing::IteratorFlags filters,
++        const QStringList &filterNames) final;
++
++    IteratorUniquePtr endEntryList() final { return {}; }
+ #else
+     Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
+--- a/src/libs/utils/fsengine/fsenginehandler.cpp
++++ b/src/libs/utils/fsengine/fsenginehandler.cpp
+@@ -23,7 +23,8 @@
+ public:
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-    IteratorUniquePtr beginEntryList(const QString &path,
+-                                     QDir::Filters filters,
+-                                     const QStringList &filterNames) override
++    IteratorUniquePtr beginEntryList(
++        const QString &path,
++        QDirListing::IteratorFlags filters,
++        const QStringList &filterNames) override
+     {
+         return std::make_unique<FileIteratorWrapper>(
diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
index 5c8f2609c396..3bd904903799 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 	"${FILESDIR}"/${PN}-14.0.1-clang19.patch
+	"${FILESDIR}"/${PN}-14.0.2-qt681.patch
 )
 
 pkg_setup() {
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index aa273caaffec..99037250bd35 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -9,6 +9,6 @@ EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef63595
 EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84
 EBUILD qtmultimedia-6.7.3.ebuild 3605 BLAKE2B 46933e93347fdce8506a9a646ca75fab64904cb339944479524682590c420d90c53bca5e98c40a5f44d3ed3549fa8592772577459bd35a435fc004cc87a2defb SHA512 52f89bb2de3109f65f3eebb259667e83d005fa5e9854d79f4b38426efee675a0ba0ac86db9953b2ce529848379ec675c00367115098288d53409346fbdd61890
 EBUILD qtmultimedia-6.8.0.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
-EBUILD qtmultimedia-6.8.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
-EBUILD qtmultimedia-6.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
+EBUILD qtmultimedia-6.8.9999.ebuild 3857 BLAKE2B 36d6cb2d00fac614d63b1dd560baa9c4b808fb08ecdcfbbd475d2702fe0002bd4cd51d487d3dcc741fd3346951454469bd975308b498b38e02b41eafd3db2394 SHA512 b08f1b8052f43c9a84e45db1e40705ea71f65ead4af6d4bab613f5e64c57cc302bab0eaf842b19becb228507048c38bd14f11f404e055a1b08a7bed8a09e8e54
+EBUILD qtmultimedia-6.9999.ebuild 3857 BLAKE2B 36d6cb2d00fac614d63b1dd560baa9c4b808fb08ecdcfbbd475d2702fe0002bd4cd51d487d3dcc741fd3346951454469bd975308b498b38e02b41eafd3db2394 SHA512 b08f1b8052f43c9a84e45db1e40705ea71f65ead4af6d4bab613f5e64c57cc302bab0eaf842b19becb228507048c38bd14f11f404e055a1b08a7bed8a09e8e54
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 90448d9168fe..2b44b871eb93 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -109,7 +109,6 @@ src_configure() {
 		$(qt_feature screencast pipewire)
 		$(qt_feature v4l linux_v4l)
 		$(qt_feature vaapi)
-		-DQT_UNITY_BUILD=OFF # currently fails to build with
 	)
 
 	# ALSA backend is experimental off-by-default and can take priority
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 90448d9168fe..2b44b871eb93 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -109,7 +109,6 @@ src_configure() {
 		$(qt_feature screencast pipewire)
 		$(qt_feature v4l linux_v4l)
 		$(qt_feature vaapi)
-		-DQT_UNITY_BUILD=OFF # currently fails to build with
 	)
 
 	# ALSA backend is experimental off-by-default and can take priority
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 16eb1c8f7370..3bd7db33a369 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -4,9 +4,9 @@ AUX qtquick3d-6.7.2-gcc15.patch 1365 BLAKE2B 574cf06f28c4ff2c8415f302bf2061b1b38
 DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2
 DIST qtquick3d-everywhere-src-6.7.3.tar.xz 66208152 BLAKE2B d165ea6d61c3b7e0253e6cc28a33c298a30b78add8cb761b460df280ebc069c979e52868b5675e15d4b2add6110f610bd9c6160848c7e02e5be0313f16179ec2 SHA512 cdfc34521a201325ee0d41dfb5608fc9deca6c27d71d27e170d147a53fad808c4e70ee67b5c7598c8685b8c534dd5fa8460f436ae4e7a208b7d5be27bf1631d5
 DIST qtquick3d-everywhere-src-6.8.0.tar.xz 75282076 BLAKE2B 828708dabbc05ce4f00235274bae3b5ebf93b5430c267e18d3d77f69f79b0085324531b55997b7850bbea5fb775dc6c6f32a7a273e4eb33634d173c63abce841 SHA512 961f38845a07cb3792a1dc2c15784f526eb4da4ab6bb69825f7708076acff323ab9364434ad1099ac79a0f047b094f1b9bcd41e038f9520bda3dc361dc2f9529
-EBUILD qtquick3d-6.7.2.ebuild 1081 BLAKE2B 8a505568442fdcee697baecae2cd545ab213da2a1f3fc426052f3d24e1e235cf53f9852cb454a7b03943e863a049b376ac80c3edfadb49b68a136f6e176e482b SHA512 60b53323dbbc48d8f2c41f91f805fda4d85c86d6a9467a0b97a31c4698b5249682e0eb3d0a57e2d79de6012f4151cc9b96d91d6c09c38d9aa0089ef17393c612
-EBUILD qtquick3d-6.7.3.ebuild 1083 BLAKE2B cce5938640503df2750228a4684da603493ba357f7430fa8fce4d78a20458c69e86980dda8667eaf6392a9bf2054f940505f5b7e403c026f91281e23439802d8 SHA512 da7e90f84f4061a33647c163033af46a6093ed093d801255fea4454ef623fe8811f270388738797dab428d3fd6513a7639df6e5dfa739e7238efbc7ee9905597
-EBUILD qtquick3d-6.8.0.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868
-EBUILD qtquick3d-6.8.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868
-EBUILD qtquick3d-6.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868
+EBUILD qtquick3d-6.7.2.ebuild 1112 BLAKE2B 0727d60b992b12e5014fa6c219020ddfb23e0874beb1f70dde429ac10fa32f86fa81705553e62e64fc6854242977b275b1ac858a043b6f4fb5bfc2396c0d8f77 SHA512 18ad274c3b7f5fe11162302f59e56e2c96b0c60aabe851c2dd5ee01341d73443cc2475e32083388441b7bcee969f610458036158b6ff593ff3b614203682f830
+EBUILD qtquick3d-6.7.3.ebuild 1114 BLAKE2B 6d7888675abbaa0210b3a4131871641fc9434f5a03825db6b10e2eed68b5a8d8ca544cf7bdab89967b724f229b706ab458678b994d1c697dd5b9746f2254bc57 SHA512 1ea320f1f14a5273f032558dd5b423c5e88033b99c2a53089fe657bee4403d1728b924e0f59f77bd1ccdc891d1107ce3e787d34e353186378d25ed69f111f4e4
+EBUILD qtquick3d-6.8.0.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
+EBUILD qtquick3d-6.8.9999.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
+EBUILD qtquick3d-6.9999.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
index a5bf7527d264..bd6e430f7c47 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 )
 
 CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
 	tst_qquick3dassetimport
 )
 
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
index b88f6ad4308a..9ff7b18ab58d 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 )
 
 CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
 	tst_qquick3dassetimport
 )
 
diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.0.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.0.ebuild
index aba06df17246..7dd511a1fd8f 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.0.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.0.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 )
 
 CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
 	tst_qquick3dassetimport
 )
 
diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
index aba06df17246..7dd511a1fd8f 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 )
 
 CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
 	tst_qquick3dassetimport
 )
 
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index aba06df17246..7dd511a1fd8f 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 )
 
 CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
 	tst_qquick3dassetimport
 )
 
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index af0af2257056..9dcc64b608d9 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -4,6 +4,6 @@ DIST qttools-everywhere-src-6.8.0.tar.xz 9059032 BLAKE2B 83ec98a8cbaf049649b8df0
 EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4a77d671a5311fcd7e6170bc29764560993be958cc8ea58d6c31d8132372a5f65197a69acd3eee45d211cbbf95ee653849faa7d98a302db07f60e3b79b3e4912 SHA512 69930be9d05a6fbb10c616b8ec8b664d40428abbf516777ac5fcf85adc4a2ed39a82bcbfbb988aef8568ac0a3adcb4939fb89e531e90bbda97c751c6ff0e3e49
 EBUILD qttools-6.7.3.ebuild 4665 BLAKE2B e85c3ddd06e3d73a2420dd29bac6eaebb0892583af4055f895d85bae07e654618c7ea508c9a4cb4dd4bb5c27d3d4231fa2087b21fe88ef3f2ad6b3f25fe229c5 SHA512 4e072a9bba94ddcadb4772d10faffd3bd453c1c3041f4a73a950b3384df408c25c8851e1fcccdd4478d2e1921262cfc0f10175ef14db941469d825bab50cac22
 EBUILD qttools-6.8.0.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
-EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
-EBUILD qttools-6.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
+EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B f9aaf4659f8c5d8471305308c7d2928bd3c560f470fcde0442d8c25c2bab758c5e8e7976fe006082326b26c9be7a2cc0c5296db166b1fa8604e314376114be8d SHA512 182e3d7db9c8549c400d63d086469c9109a30c561022e7f84ed36a1b8b186450e5ec0a233be5fb3c7a7d4fee4900a8ea4c1b3896cc3e520c00b2d82b0ca83804
+EBUILD qttools-6.9999.ebuild 4918 BLAKE2B f9aaf4659f8c5d8471305308c7d2928bd3c560f470fcde0442d8c25c2bab758c5e8e7976fe006082326b26c9be7a2cc0c5296db166b1fa8604e314376114be8d SHA512 182e3d7db9c8549c400d63d086469c9109a30c561022e7f84ed36a1b8b186450e5ec0a233be5fb3c7a7d4fee4900a8ea4c1b3896cc3e520c00b2d82b0ca83804
 MISC metadata.xml 1495 BLAKE2B 05681d2d714d1d6e2939d105c48c3e16a1a99b4196b04fe0f1ed62cd628f0b3d743d75229aa123c887dfd2abea1e67b43d7224a1603d889f2f75d964f51206b8 SHA512 6c692eed887713ef7a3d33b2644ecfcf0ec2f346e5e15857996b8a6916a137d22cb2255cc2a44de06a4fb1e0818395842c52925b232ac49d7280210d2441f89a
diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild
index 22ec0d708b1f..68f3a306f5bb 100644
--- a/dev-qt/qttools/qttools-6.8.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.8.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_COMPAT=( {17..19} ) # see .cmake.conf for minimum
 LLVM_OPTIONAL=1
 
 # behaves very badly when qttools is not already installed, also
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 22ec0d708b1f..68f3a306f5bb 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_COMPAT=( {17..19} ) # see .cmake.conf for minimum
 LLVM_OPTIONAL=1
 
 # behaves very badly when qttools is not already installed, also