public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
Date: Mon, 20 Jun 2022 18:03:27 +0000 (UTC)	[thread overview]
Message-ID: <1655748123.80e7dde77de97891ef7a820b96f0c58454fb890c.chiitoo@gentoo> (raw)

commit:     80e7dde77de97891ef7a820b96f0c58454fb890c
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 09:14:37 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:02:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=80e7dde7

dev-qt/qttools: add a USE-flag for each tool

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qttools/metadata.xml            | 12 ++++++++++
 dev-qt/qttools/qttools-6.3.0.ebuild    | 40 +++++++++++++++++++++++++++++---
 dev-qt/qttools/qttools-6.3.9999.ebuild | 42 ++++++++++++++++++++++++++++++----
 dev-qt/qttools/qttools-6.9999.ebuild   | 42 ++++++++++++++++++++++++++++++----
 4 files changed, 125 insertions(+), 11 deletions(-)

diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml
index 32568f62..5f0baf52 100644
--- a/dev-qt/qttools/metadata.xml
+++ b/dev-qt/qttools/metadata.xml
@@ -5,6 +5,18 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<use>
+		<flag name="assistant">Build Qt Assistant</flag>
+		<flag name="designer">Build Qt Designer</flag>
+		<flag name="distancefieldgenerator">Build Qt Distance Field Generator</flag>
+		<flag name="linguist">Build Qt Linguist</flag>
+		<flag name="pixeltool">Build Qt Pixeltool</flag>
+		<flag name="qdbus">Build the Qt D-Bus Interface and D-Bus Viewer</flag>
+		<flag name="qdoc">Build Qt Documentation Generator</flag>
+		<flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag>
+		<flag name="qtdiag">Build Qt Diag</flag>
+		<flag name="qtplugininfo">Build Qt Plugin Info</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>

diff --git a/dev-qt/qttools/qttools-6.3.0.ebuild b/dev-qt/qttools/qttools-6.3.0.ebuild
index 7603c1dd..23e1c087 100644
--- a/dev-qt/qttools/qttools-6.3.0.ebuild
+++ b/dev-qt/qttools/qttools-6.3.0.ebuild
@@ -5,14 +5,48 @@ EAPI=8
 
 inherit qt6-build
 
-DESCRIPTION="Qt Tools"
+DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="
+	assistant designer distancefieldgenerator linguist pixeltool
+	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+"
+REQUIRED_USE="linguist? ( designer )"
+
 DEPEND="
-	=dev-qt/qtbase-${PV}*
-	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtbase-${PV}*[network]
+	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
+	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+	distancefieldgenerator? (
+		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtdeclarative-${PV}*
+	)
+	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdoc? ( sys-devel/clang:= )
+	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature assistant)
+		-DQT_FEATURE_commandlineparser=ON
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc clang)
+		$(qt_feature qtattributionsscanner)
+		$(qt_feature qtdiag)
+		$(qt_feature qtplugininfo)
+		-DQT_FEATURE_thread=ON
+	)
+
+	qt6-build_src_configure
+}

diff --git a/dev-qt/qttools/qttools-6.3.9999.ebuild b/dev-qt/qttools/qttools-6.3.9999.ebuild
index 53ce00a4..23e1c087 100644
--- a/dev-qt/qttools/qttools-6.3.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.3.9999.ebuild
@@ -1,18 +1,52 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit qt6-build
 
-DESCRIPTION="Qt Tools"
+DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="
+	assistant designer distancefieldgenerator linguist pixeltool
+	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+"
+REQUIRED_USE="linguist? ( designer )"
+
 DEPEND="
-	=dev-qt/qtbase-${PV}*
-	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtbase-${PV}*[network]
+	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
+	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+	distancefieldgenerator? (
+		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtdeclarative-${PV}*
+	)
+	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdoc? ( sys-devel/clang:= )
+	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature assistant)
+		-DQT_FEATURE_commandlineparser=ON
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc clang)
+		$(qt_feature qtattributionsscanner)
+		$(qt_feature qtdiag)
+		$(qt_feature qtplugininfo)
+		-DQT_FEATURE_thread=ON
+	)
+
+	qt6-build_src_configure
+}

diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 53ce00a4..23e1c087 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -1,18 +1,52 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit qt6-build
 
-DESCRIPTION="Qt Tools"
+DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="
+	assistant designer distancefieldgenerator linguist pixeltool
+	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+"
+REQUIRED_USE="linguist? ( designer )"
+
 DEPEND="
-	=dev-qt/qtbase-${PV}*
-	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtbase-${PV}*[network]
+	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
+	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+	distancefieldgenerator? (
+		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtdeclarative-${PV}*
+	)
+	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdoc? ( sys-devel/clang:= )
+	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature assistant)
+		-DQT_FEATURE_commandlineparser=ON
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc clang)
+		$(qt_feature qtattributionsscanner)
+		$(qt_feature qtdiag)
+		$(qt_feature qtplugininfo)
+		-DQT_FEATURE_thread=ON
+	)
+
+	qt6-build_src_configure
+}


             reply	other threads:[~2022-06-20 18:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-20 18:03 Jimi Huotari [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-02 22:02 [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/ Sam James
2022-09-24 17:03 Andreas Sturmlechner
2022-09-24 21:24 Andreas Sturmlechner
2022-10-16 15:14 Jimi Huotari
2022-11-05 16:39 Andreas Sturmlechner
2023-03-26 17:36 Jimi Huotari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1655748123.80e7dde77de97891ef7a820b96f0c58454fb890c.chiitoo@gentoo \
    --to=chiitoo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox