gentoo auto-resync : 10:02:2024 - 17:34:25

7 files changed, 39 insertions, 40 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 82d4e89266b0..bf1751d08b39 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 353eedeb2e2d..dbed4bc1aae2 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -4,5 +4,5 @@ DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee0
 DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
 EBUILD qt-creator-12.0.1.ebuild 6833 BLAKE2B c140a41fbc31da0603b5a16d74fb42d895493add3a174b2e76727b0b8fa502f77ebd467d6a07a34070c761a9856a8eac67ffe523cafc8833744f9d4a9319fbad SHA512 eaa9132c40da8e94e7ab3c8dd2ef5f260fc690592142b3db71d859455bac29402d4250e7e2043f5ab3c02904e295a269dbea0d2ca0cce48703d61d5476841ba0
 EBUILD qt-creator-12.0.2.ebuild 6834 BLAKE2B ef5299483effff67785ee685b95cb6b02f6c22a5862ae8257c0aa12b3bcb116df85b267b37751123aaad43029bd24e5fd3d6076eae2d38e74bfb7e05308aa97c SHA512 f719ebe88b655f3886d52e2ba59f095ed8938b522a292a322a16c833cd1ac221e63d21997a37e866ab7d560048408b4e37f55f741ada8fbe6dcb807ec636f0a2
-EBUILD qt-creator-9999.ebuild 6834 BLAKE2B ef5299483effff67785ee685b95cb6b02f6c22a5862ae8257c0aa12b3bcb116df85b267b37751123aaad43029bd24e5fd3d6076eae2d38e74bfb7e05308aa97c SHA512 f719ebe88b655f3886d52e2ba59f095ed8938b522a292a322a16c833cd1ac221e63d21997a37e866ab7d560048408b4e37f55f741ada8fbe6dcb807ec636f0a2
+EBUILD qt-creator-9999.ebuild 6848 BLAKE2B 23617c9945232cf05c5662ea373bba33d4fd1dd51538d34b365bca0c1984f9e88efa0cc2fb711aaa0ca321f4e5403396b6c290d103c1d96d5e85a86cd03de4fe SHA512 022a436248dfc939d59b68f4538db90de1ffbc4a82e355a9a99966af60319c120242a5f2e0cec8c3f38509a970f38efda523e58bd09257721d60d47752ff0980
 MISC metadata.xml 1242 BLAKE2B b0b082554e88fe15e707583e01c9883ac2c695244328eec8cfdcb948c1cd0f782940c429efaf83828fafd10c05ac468054039e8c73cc8fbf79dde1d5a2e990bc SHA512 7d877389c81c815a2691a6463b2ee122766bcd93f75fffd5faab014e06f901efa77f500bef2c67ece5fb37d5fc41e916668e38e282b72c1825cfec53c3c73e51
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a2c7444d9223..4587a1c7c566 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -35,9 +37,9 @@ IUSE="
 	+clang +designer doc +help qmldesigner serialterminal
 	+svg test +tracing webengine
 "
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-LLVM_MAX_SLOT=17
 QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
@@ -47,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtdeclarative-${QT_PV}=
 	clang? (
 		dev-cpp/yaml-cpp:=
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
 	)
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (
@@ -84,13 +86,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
 	python-any-r1_pkg_setup
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 446764e883b8..cca0927f9e93 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,6 +1,6 @@
 DIST qttools-everywhere-src-6.6.1.tar.xz 8583536 BLAKE2B c52fd1643f925909c2e5f677574ee202c0de5b810e9ca603f27511b123ce570c4bbf4aa3efd2c4347dace91d92546f5cb90e7ca783b7182369d13dcdbdac2db4 SHA512 7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909
 EBUILD qttools-6.6.1.ebuild 4499 BLAKE2B f3765a82003b42f1b097b25233d63ed6d861943e55071bca07f5bac1e85cb2734e215b0c712677efcb82e0382c49cc2a399ad611796551101f757f94364603dd SHA512 fe9b7fcbe1c03f1c5f1336fe892123f02efde25227d4c300e41167675670a9edbe98b81c69547b6c64e86584d5a1bbd20a8482194b50520e73348f3d6c697074
-EBUILD qttools-6.6.9999.ebuild 4500 BLAKE2B 8890b17e3db753f7e4e90e2254e6ca0d4fa0eeba6e1575ddcc59ed5544e2e923586cc07514a592cf80099e06ee411ceb7e5c2f79adf501280b9c08b6da33c041 SHA512 491ca92e05da5ccbadf13a52421e58d9d926034e37db47e973088c8a31cab09ad7cef2b3ce31f1a8761988dd7ba37a7bfc4e5707c993d61d0e4a1b8466f15f7b
-EBUILD qttools-6.7.9999.ebuild 4652 BLAKE2B 8fe303ec1472b5f499d55eb788bef5d249a859307db54649d143481d77163f69762f7b8078b7c25af56af77d11137f62cd09d39f1b23ea48bfdf9f6579027cdf SHA512 42a0e9123161d80166c731f69a905ec1745a4ec6b20fa197aeb19046077618f55550b359013b48c6a6dad66f58c3db463d9b905512bc6b449e3fdc5283fc4bb7
-EBUILD qttools-6.9999.ebuild 4652 BLAKE2B 8fe303ec1472b5f499d55eb788bef5d249a859307db54649d143481d77163f69762f7b8078b7c25af56af77d11137f62cd09d39f1b23ea48bfdf9f6579027cdf SHA512 42a0e9123161d80166c731f69a905ec1745a4ec6b20fa197aeb19046077618f55550b359013b48c6a6dad66f58c3db463d9b905512bc6b449e3fdc5283fc4bb7
+EBUILD qttools-6.6.9999.ebuild 4541 BLAKE2B 23f422d173c81c34b000b0864f940aed0042b135ef763795c385db49d3d1104382d73542c57fe184e53da0d3c32de437e3859af66838989a659c30ac8d3f8458 SHA512 bcb65650fa0bbd90e79814ac3d77d5a7420c799603600b99a394be6b41703eed3af77227d3336613772db2e4d426ebe75484dcd795f7bdf70e362562b8b7e730
+EBUILD qttools-6.7.9999.ebuild 4571 BLAKE2B f7e30a9c4acff12ed5686b5f0e092ace4625fde91714c85ff747d6aea8ee1bb7a8627c7b69d2a53a9ee820e4a4b3dba5adcc0b6f0f1d2458f2958740e2f9d15a SHA512 fd55d2c5da4f95292708a5da7ebc7acab433e1f74ef71b4cc6c3be93cb2591cacb24d4b048db91e6e96e16fbc229088b22bf0c59cfd646eaf986b80062b18c2b
+EBUILD qttools-6.9999.ebuild 4571 BLAKE2B f7e30a9c4acff12ed5686b5f0e092ace4625fde91714c85ff747d6aea8ee1bb7a8627c7b69d2a53a9ee820e4a4b3dba5adcc0b6f0f1d2458f2958740e2f9d15a SHA512 fd55d2c5da4f95292708a5da7ebc7acab433e1f74ef71b4cc6c3be93cb2591cacb24d4b048db91e6e96e16fbc229088b22bf0c59cfd646eaf986b80062b18c2b
 MISC metadata.xml 1415 BLAKE2B 082d3fb170635bf0434df13b560689eeafd163b618f26e000ec23b8007329e83fe3537be983b44a4e055271fa20a37fed570585c9af950b3488f2cd6806f581a SHA512 c0469f0638488b75ee9a68fb213df728eafa7d13facae1929ca4d847f3b2fbc682522c315c0ae42688cbd7a00a134168009c6fb5bfa66ad318e829704aad6761
diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild
index 9f6085643a94..49dfe820f8ac 100644
--- a/dev-qt/qttools/qttools-6.6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.6.9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit desktop llvm optfeature qt6-build
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -20,6 +22,7 @@ IUSE="
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
 REQUIRED_USE="
 	assistant? ( widgets )
+	clang? ( ${LLVM_REQUIRED_USE} )
 	designer? ( qml widgets )
 	distancefieldgenerator? ( qml widgets )
 	pixeltool? ( widgets )
@@ -31,11 +34,15 @@ REQUIRED_USE="
 # and 3rdparty/ tries to FetchContent gtest)
 RESTRICT="test"
 
-LLVM_MAX_SLOT=17
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[network,widgets?]
 	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-	clang? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= )
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/llvm:${LLVM_SLOT}
+		')
+	)
 	designer? (
 		~dev-qt/qtbase-${PV}:6[xml,zstd=]
 		zstd? ( app-arch/zstd:= )
@@ -52,12 +59,8 @@ DEPEND="
 	)
 "
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild
index 2a9817bfe028..99231843045d 100644
--- a/dev-qt/qttools/qttools-6.7.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.7.9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit desktop llvm optfeature qt6-build
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -20,6 +22,7 @@ IUSE="
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
 REQUIRED_USE="
 	assistant? ( widgets )
+	clang? ( ${LLVM_REQUIRED_USE} )
 	designer? ( qml widgets )
 	distancefieldgenerator? ( qml widgets )
 	pixeltool? ( widgets )
@@ -31,14 +34,14 @@ REQUIRED_USE="
 # and 3rdparty/ tries to FetchContent gtest)
 RESTRICT="test"
 
-QTTOOLS_LLVM_SLOTS=({17..15}) # QDOC_MINIMUM_CLANG_VERSION
-LLVM_MAX_SLOT=${QTTOOLS_LLVM_SLOTS[0]}
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[network,widgets?]
 	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
 	clang? (
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
-		|| ( $(printf "sys-devel/clang:%d " "${QTTOOLS_LLVM_SLOTS[@]}") )
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/llvm:${LLVM_SLOT}
+		')
 	)
 	designer? (
 		~dev-qt/qtbase-${PV}:6[xml,zstd=]
@@ -56,12 +59,8 @@ DEPEND="
 	)
 "
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 2a9817bfe028..99231843045d 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit desktop llvm optfeature qt6-build
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -20,6 +22,7 @@ IUSE="
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
 REQUIRED_USE="
 	assistant? ( widgets )
+	clang? ( ${LLVM_REQUIRED_USE} )
 	designer? ( qml widgets )
 	distancefieldgenerator? ( qml widgets )
 	pixeltool? ( widgets )
@@ -31,14 +34,14 @@ REQUIRED_USE="
 # and 3rdparty/ tries to FetchContent gtest)
 RESTRICT="test"
 
-QTTOOLS_LLVM_SLOTS=({17..15}) # QDOC_MINIMUM_CLANG_VERSION
-LLVM_MAX_SLOT=${QTTOOLS_LLVM_SLOTS[0]}
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[network,widgets?]
 	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
 	clang? (
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
-		|| ( $(printf "sys-devel/clang:%d " "${QTTOOLS_LLVM_SLOTS[@]}") )
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/llvm:${LLVM_SLOT}
+		')
 	)
 	designer? (
 		~dev-qt/qtbase-${PV}:6[xml,zstd=]
@@ -56,12 +59,8 @@ DEPEND="
 	)
 "
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 }
 
 src_configure() {