summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-08-19 22:24:12 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-09-05 09:01:01 -0400
commit5f7ab1d0350672c2d9f6c90793c32e57aaec34b6 (patch)
tree4177f8da5240c9c8a2757b9851a76a08fce0fe36 /dev-qt/qttools/qttools-6.9999.ebuild
parentdev-qt/*: import qt6 live ebuilds from ::qt (diff)
downloadgentoo-5f7ab1d0350672c2d9f6c90793c32e57aaec34b6.tar.gz
gentoo-5f7ab1d0350672c2d9f6c90793c32e57aaec34b6.tar.bz2
gentoo-5f7ab1d0350672c2d9f6c90793c32e57aaec34b6.zip
dev-qt/*: streamline style a bit across qt6 ebuilds
Misc minor adjustments / sorting, but more commonly: * use same RDEPEND + DEPEND ordering everywhere, bit of both order is used all across and sometime inverted in Qt5's so let's match skel.ebuild to avoid confusion * use explicit :6 slots, not necessary with =PV but this is more about normalizing usage when multiple slots exist (plus *cough* qa-vdb won't complaint anymore) Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qttools/qttools-6.9999.ebuild')
-rw-r--r--dev-qt/qttools/qttools-6.9999.ebuild26
1 files changed, 13 insertions, 13 deletions
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index e75eadff55af..2d917d3aaffa 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -13,23 +13,23 @@ fi
IUSE="
assistant designer distancefieldgenerator +linguist pixeltool
- qattributionsscanner qdbus qdoc qdiag qplugininfo
+ qattributionsscanner qdbus qdiag qdoc qplugininfo
"
-DEPEND="
- =dev-qt/qtbase-${PV}*[network]
- assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
- designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+RDEPEND="
+ =dev-qt/qtbase-${PV}*:6[network]
+ assistant? ( =dev-qt/qtbase-${PV}*:6[sql,widgets] )
+ designer? ( =dev-qt/qtbase-${PV}*:6[widgets] )
distancefieldgenerator? (
- =dev-qt/qtbase-${PV}*[widgets]
- =dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtbase-${PV}*:6[widgets]
+ =dev-qt/qtdeclarative-${PV}*:6
)
- pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
- qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+ pixeltool? ( =dev-qt/qtbase-${PV}*:6[widgets] )
+ qdbus? ( =dev-qt/qtbase-${PV}*:6[widgets] )
+ qdiag? ( =dev-qt/qtbase-${PV}*:6[opengl,widgets] )
qdoc? ( sys-devel/clang:= )
- qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
src_configure() {
local mycmakeargs=(
@@ -41,8 +41,8 @@ src_configure() {
$(qt_feature pixeltool)
$(qt_feature qattributionsscanner qtattributionsscanner)
$(qt_feature qdbus)
- $(qt_feature qdoc clang)
$(qt_feature qdiag qtdiag)
+ $(qt_feature qdoc clang)
$(qt_feature qplugininfo qtplugininfo)
-DQT_FEATURE_thread=ON
)
@@ -60,7 +60,7 @@ src_install() {
use pixeltool && qt6_symlink_binary_to_path pixeltool 6
use qdbus && qt6_symlink_binary_to_path qdbus 6
use qdbus && qt6_symlink_binary_to_path qdbusviewer 6
- use qdoc && qt6_symlink_binary_to_path qdoc 6
use qdiag && qt6_symlink_binary_to_path qtdiag 6
+ use qdoc && qt6_symlink_binary_to_path qdoc 6
use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
}