public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-06-20 18:03 Jimi Huotari
  0 siblings, 0 replies; 7+ messages in thread
From: Jimi Huotari @ 2022-06-20 18:03 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-08-02 22:02 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-08-02 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     de6416e893f65fc894f9da59632337c44291c04c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 22:02:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 22:02:13 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=de6416e8

dev-qt/qttools: [QA] fix DTD HTTP->HTTPS

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qttools/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml
index 5f0baf52..b86ca58b 100644
--- a/dev-qt/qttools/metadata.xml
+++ b/dev-qt/qttools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-09-24 17:03 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ce6be497bec9f83f63b7b5e01e8ffb6529c06343
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:42:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 14:42:36 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ce6be497

dev-qt/qttools: drop 6.3.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qttools/Manifest             |  1 -
 dev-qt/qttools/qttools-6.3.2.ebuild | 52 -------------------------------------
 2 files changed, 53 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
deleted file mode 100644
index 229a67e4..00000000
--- a/dev-qt/qttools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qttools-everywhere-src-6.3.2.tar.xz 8629400 BLAKE2B 594f7f31e0f10006d1c58d26c5ae13b7f9c8b5770adaddee90a176676dff2029215501d01d599da0656876cd6f8b97275754a9b8c37735412154ca3f458656b3 SHA512 ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1

diff --git a/dev-qt/qttools/qttools-6.3.2.ebuild b/dev-qt/qttools/qttools-6.3.2.ebuild
deleted file mode 100644
index 23e1c087..00000000
--- a/dev-qt/qttools/qttools-6.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-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}*[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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-09-24 21:24 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     31c20d5dbbecd6055798d9c5695d37d362f681ef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 20:25:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 20:25:36 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=31c20d5d

dev-qt/qttools: drop 6.3.9999

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qttools/qttools-6.3.9999.ebuild | 52 ----------------------------------
 1 file changed, 52 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.3.9999.ebuild b/dev-qt/qttools/qttools-6.3.9999.ebuild
deleted file mode 100644
index 23e1c087..00000000
--- a/dev-qt/qttools/qttools-6.3.9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-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}*[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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-10-16 15:14 Jimi Huotari
  0 siblings, 0 replies; 7+ messages in thread
From: Jimi Huotari @ 2022-10-16 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a22b3b6f4b215d2ed1462f2357feb7053b8cfed7
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 14:59:39 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 15:13:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a22b3b6f

dev-qt/qttools: remove a required use and make 'linguist' default on

There seems to be no apparent reason for
'REQUIRED_USE="linguist? ( designer )"', and the origins of it have
been lost in time.

Furthermore, the 'linguist' flag may usually be more wanted than not,
so we'll enable it by default.

Bug: https://bugs.gentoo.org/863224
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qttools/qttools-6.4.0.ebuild    | 3 +--
 dev-qt/qttools/qttools-6.4.9999.ebuild | 3 +--
 dev-qt/qttools/qttools-6.9999.ebuild   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.4.0.ebuild b/dev-qt/qttools/qttools-6.4.0.ebuild
index 5ba47589..6aa7cb05 100644
--- a/dev-qt/qttools/qttools-6.4.0.ebuild
+++ b/dev-qt/qttools/qttools-6.4.0.ebuild
@@ -12,10 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-	assistant designer distancefieldgenerator linguist pixeltool
+	assistant designer distancefieldgenerator +linguist pixeltool
 	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
 "
-REQUIRED_USE="linguist? ( designer )"
 
 DEPEND="
 	=dev-qt/qtbase-${PV}*[network]

diff --git a/dev-qt/qttools/qttools-6.4.9999.ebuild b/dev-qt/qttools/qttools-6.4.9999.ebuild
index 23e1c087..fb733da0 100644
--- a/dev-qt/qttools/qttools-6.4.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.4.9999.ebuild
@@ -12,10 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-	assistant designer distancefieldgenerator linguist pixeltool
+	assistant designer distancefieldgenerator +linguist pixeltool
 	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
 "
-REQUIRED_USE="linguist? ( designer )"
 
 DEPEND="
 	=dev-qt/qtbase-${PV}*[network]

diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 23e1c087..fb733da0 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -12,10 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-	assistant designer distancefieldgenerator linguist pixeltool
+	assistant designer distancefieldgenerator +linguist pixeltool
 	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
 "
-REQUIRED_USE="linguist? ( designer )"
 
 DEPEND="
 	=dev-qt/qtbase-${PV}*[network]


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2022-11-05 16:39 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-11-05 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5a2c6f130900a6141212c7627856be7173ad2f2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 09:07:50 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 09:07:50 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a2c6f13

dev-qt/qttools: drop 6.4.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qttools/Manifest             |  1 -
 dev-qt/qttools/qttools-6.4.0.ebuild | 55 -------------------------------------
 2 files changed, 56 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
deleted file mode 100644
index c155251c..00000000
--- a/dev-qt/qttools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5 SHA512 ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44

diff --git a/dev-qt/qttools/qttools-6.4.0.ebuild b/dev-qt/qttools/qttools-6.4.0.ebuild
deleted file mode 100644
index 6aa7cb05..00000000
--- a/dev-qt/qttools/qttools-6.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="
-	assistant designer distancefieldgenerator +linguist pixeltool
-	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
-"
-
-DEPEND="
-	=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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.4.0-clang-15-build.patch" # Bug 873640
-)
-
-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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/
@ 2023-03-26 17:36 Jimi Huotari
  0 siblings, 0 replies; 7+ messages in thread
From: Jimi Huotari @ 2023-03-26 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     0aabb11a0799a8c8e61e5b7168ecaefd2966ce50
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 17:34:55 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 17:34:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0aabb11a

dev-qt/qttools: symlink user-facing binaries according to USE

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qttools/qttools-6.4.9999.ebuild | 15 +++++++++++++++
 dev-qt/qttools/qttools-6.5.9999.ebuild | 15 +++++++++++++++
 dev-qt/qttools/qttools-6.9999.ebuild   | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.4.9999.ebuild b/dev-qt/qttools/qttools-6.4.9999.ebuild
index fb733da0..339ce7ed 100644
--- a/dev-qt/qttools/qttools-6.4.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.4.9999.ebuild
@@ -49,3 +49,18 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	use assistant && qt6_symlink_binary_to_path assistant 6
+	use designer && qt6_symlink_binary_to_path designer 6
+	use distancefieldgenerator && qt6_symlink_binary_to_path qdistancefieldgenerator 6
+	use linguist && qt6_symlink_binary_to_path linguist 6
+	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 qtdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+}

diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild
index fb733da0..339ce7ed 100644
--- a/dev-qt/qttools/qttools-6.5.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.5.9999.ebuild
@@ -49,3 +49,18 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	use assistant && qt6_symlink_binary_to_path assistant 6
+	use designer && qt6_symlink_binary_to_path designer 6
+	use distancefieldgenerator && qt6_symlink_binary_to_path qdistancefieldgenerator 6
+	use linguist && qt6_symlink_binary_to_path linguist 6
+	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 qtdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+}

diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index fb733da0..339ce7ed 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -49,3 +49,18 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	use assistant && qt6_symlink_binary_to_path assistant 6
+	use designer && qt6_symlink_binary_to_path designer 6
+	use distancefieldgenerator && qt6_symlink_binary_to_path qdistancefieldgenerator 6
+	use linguist && qt6_symlink_binary_to_path linguist 6
+	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 qtdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-03-26 17:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-20 18:03 [gentoo-commits] proj/qt:master commit in: dev-qt/qttools/ Jimi Huotari
  -- strict thread matches above, loose matches on Subject: below --
2022-08-02 22:02 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox