diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-02-10 17:34:25 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-02-10 17:34:25 +0000 |
| commit | 0bb42730e8fc9c8e571f12e3189c6c6f8d532c24 (patch) | |
| tree | cba6032fbed30be2b0764494607c3ec9dda0c18a /dev-qt/qttools | |
| parent | cc901a8ce7c6bfe97e3b4f048619693d360ae348 (diff) | |
gentoo auto-resync : 10:02:2024 - 17:34:25
Diffstat (limited to 'dev-qt/qttools')
| -rw-r--r-- | dev-qt/qttools/Manifest | 6 | ||||
| -rw-r--r-- | dev-qt/qttools/qttools-6.6.9999.ebuild | 19 | ||||
| -rw-r--r-- | dev-qt/qttools/qttools-6.7.9999.ebuild | 19 | ||||
| -rw-r--r-- | dev-qt/qttools/qttools-6.9999.ebuild | 19 |
4 files changed, 32 insertions, 31 deletions
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() { |