gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qttools: migrate live to llvm-r1, allow slot 18

Browse Source 
Tested with 18.1.0_rc2 at same time, seems to be fine so may
as well do this now.

Skip .cmake.conf comment in 6.6.9999 given the minimum was
introduced in 6.7+. Unsure how often Qt intend to bump this,
odds are we may not need to pay attention to it if we clean
old versions up faster.

Not changing 6.6.1 given 6.6.2 is close and it can be updated
at same time to spare rebuilds.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-02-09 05:15:34 -05:00
parent c624581822
commit 930c2dbfee
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dev-qt/qttools/qttools-6.6.9999.ebuild
View File

@@ -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() {

19
dev-qt/qttools/qttools-6.7.9999.ebuild
View File

@@ -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() {

19
dev-qt/qttools/qttools-6.9999.ebuild
View File

@@ -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() {