[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-05-28 Thread Arthur Zamarin
commit: 0be9ba3fa1f5ef7b245a0835e4ec7da9a0ae94ad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 28 18:55:21 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 28 18:55:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be9ba3f

dev-qt/qttools: Stabilize 6.7.1 x86, #932862

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.7.1.ebuild 
b/dev-qt/qttools/qttools-6.7.1.ebuild
index 23340144fb82..4b194251b08a 100644
--- a/dev-qt/qttools/qttools-6.7.1.ebuild
+++ b/dev-qt/qttools/qttools-6.7.1.ebuild
@@ -16,7 +16,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-05-20 Thread Ionen Wolkens
commit: f3c9a929e26e86ebd7b415a56957c2313296714f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 20 07:55:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 20 08:45:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c9a929

dev-qt/qttools: add 6.7.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.7.1.ebuild | 154 
 2 files changed, 155 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 114064d3219e..aedaf4e5a87e 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.7.0.tar.xz 9012572 BLAKE2B 
12bfc43d390c40faafdf825d48fb1672eb52c3f1e47ea0362542712dfac56fa3b07f01a2bc196872a04e9cf1a101ea2feb4ed6b744a70c75b67111ec806e
 SHA512 
8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560
+DIST qttools-everywhere-src-6.7.1.tar.xz 9016376 BLAKE2B 
081a8a6fc838ee1dcee1b82cb46996ed246639a230f23d324fdcf2153c46ddbdd619505df0380ea20c7e9c668159dc49a061ecf57f27026b0a6fc7e6017d9b1c
 SHA512 
5b21fc8a5f208615a3493a2ae24356705477c50f675cd7f29fc2eb7f7af5c2af7859068d26404ff8075d163adf0b0c4f267d14fa3f618de76ace8cd353a58a15

diff --git a/dev-qt/qttools/qttools-6.7.1.ebuild 
b/dev-qt/qttools/qttools-6.7.1.ebuild
new file mode 100644
index ..fd8e80ea6380
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.7.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+
+# behaves very badly when qttools is not already installed, also
+# other issues to handle (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+QT6_RESTRICT_TESTS=1
+
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+   $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build 
(QTBUG-122634)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-20 Thread Ionen Wolkens
commit: 3049368a3708d2554b5adda968165ca0c4224325
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 20 13:28:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr 20 14:19:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3049368a

dev-qt/qttools: use QT6_RESTRICT_TESTS

Bug: https://bugs.gentoo.org/930266
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.7.0.ebuild| 11 ++-
 dev-qt/qttools/qttools-6.7..ebuild | 11 ++-
 dev-qt/qttools/qttools-6..ebuild   | 11 ++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.7.0.ebuild 
b/dev-qt/qttools/qttools-6.7.0.ebuild
index f9ea0251c71e..dee5e7804862 100644
--- a/dev-qt/qttools/qttools-6.7.0.ebuild
+++ b/dev-qt/qttools/qttools-6.7.0.ebuild
@@ -5,6 +5,12 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
 LLVM_OPTIONAL=1
+
+# behaves very badly when qttools is not already installed, also
+# other issues to handle (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+QT6_RESTRICT_TESTS=1
+
 inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
@@ -29,11 +35,6 @@ REQUIRED_USE="
qdoc? ( clang qml )
 "
 
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
 RDEPEND="
~dev-qt/qtbase-${PV}:6[network,widgets?]
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )

diff --git a/dev-qt/qttools/qttools-6.7..ebuild 
b/dev-qt/qttools/qttools-6.7..ebuild
index 6156f4c02a83..fd8e80ea6380 100644
--- a/dev-qt/qttools/qttools-6.7..ebuild
+++ b/dev-qt/qttools/qttools-6.7..ebuild
@@ -5,6 +5,12 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
 LLVM_OPTIONAL=1
+
+# behaves very badly when qttools is not already installed, also
+# other issues to handle (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+QT6_RESTRICT_TESTS=1
+
 inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
@@ -29,11 +35,6 @@ REQUIRED_USE="
qdoc? ( clang qml )
 "
 
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
 RDEPEND="
~dev-qt/qtbase-${PV}:6[network,widgets?]
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 6156f4c02a83..fd8e80ea6380 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -5,6 +5,12 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
 LLVM_OPTIONAL=1
+
+# behaves very badly when qttools is not already installed, also
+# other issues to handle (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+QT6_RESTRICT_TESTS=1
+
 inherit desktop llvm-r1 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
@@ -29,11 +35,6 @@ REQUIRED_USE="
qdoc? ( clang qml )
 "
 
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
 RDEPEND="
~dev-qt/qtbase-${PV}:6[network,widgets?]
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-19 Thread Ionen Wolkens
commit: 2de12b3d28db049f6e8701908490807aa415a2ba
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Apr 19 07:25:42 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Apr 19 07:47:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de12b3d

dev-qt/qttools: drop 6.6.2, 6.6.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   2 -
 dev-qt/qttools/qttools-6.6.2.ebuild | 151 ---
 dev-qt/qttools/qttools-6.6.3.ebuild | 153 
 3 files changed, 306 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 847e8deee9c4..114064d3219e 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1 @@
-DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
-DIST qttools-everywhere-src-6.6.3.tar.xz 8596272 BLAKE2B 
375a018d3fff0ef52e7e8e38455f8a801d6a4e715f14826605e0c6b5d33b321aa7395b598041f1459fb361773688255c0ff1e4e300d05aef18aa42f5e785a8e7
 SHA512 
621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235
 DIST qttools-everywhere-src-6.7.0.tar.xz 9012572 BLAKE2B 
12bfc43d390c40faafdf825d48fb1672eb52c3f1e47ea0362542712dfac56fa3b07f01a2bc196872a04e9cf1a101ea2feb4ed6b744a70c75b67111ec806e
 SHA512 
8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
deleted file mode 100644
index 8b4db6721996..
--- a/dev-qt/qttools/qttools-6.6.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="
-   +assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# 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 )
-   qdoc? ( clang qml )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
-RDEPEND="
-   ~dev-qt/qtbase-${PV}:6[network,widgets?]
-   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-   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:= )
-   )
-   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
-   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-   ${RDEPEND}
-   qtdiag? (
-   vulkan? ( dev-util/vulkan-headers )
-   )
-"
-
-pkg_setup() {
-   use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # prevent the clang test as it can abort due to bug #916098
-   $(cmake_use_find_package clang WrapLibClang)
-   $(cmake_use_find_package qml Qt6Qml)
-   $(cmake_use_find_package widgets Qt6Widgets)
-   $(qt_feature assistant)
-   $(qt_feature clang)
-   $(qt_feature designer)
-   $(qt_feature distancefieldgenerator)
-   $(qt_feature linguist)
-   $(qt_feature pixeltool)
-   $(qt_feature qdbus)
-   $(qt_feature qdoc)
-   $(qt_feature qtattributionsscanner)
-   $(qt_feature qtdiag)
-   $(qt_feature qtplugininfo)
-
-   # TODO?: package litehtml, but support for latest releases seem
-   # to lag behind and bundled may work out better for now
-   # https://github.com/litehtml/litehtml/issues/266
-   $(usev assistant 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-13 Thread Arthur Zamarin
commit: 46b84deefe9f0c4449f9cb4449681c21fd71100c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 17:49:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 17:50:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b84dee

dev-qt/qttools: Stabilize 6.7.0 amd64, #929242

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.7.0.ebuild 
b/dev-qt/qttools/qttools-6.7.0.ebuild
index 8099a24fd850..f9ea0251c71e 100644
--- a/dev-qt/qttools/qttools-6.7.0.ebuild
+++ b/dev-qt/qttools/qttools-6.7.0.ebuild
@@ -10,7 +10,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-02 Thread Ionen Wolkens
commit: 3d3b701635dd666c8da669ebd76f256020e0a37c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr  2 12:06:28 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr  2 13:05:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3b7016

dev-qt/qttools: add 6.7.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.7.0.ebuild | 153 
 2 files changed, 154 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 1ec4632a6e81..847e8deee9c4 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
 DIST qttools-everywhere-src-6.6.3.tar.xz 8596272 BLAKE2B 
375a018d3fff0ef52e7e8e38455f8a801d6a4e715f14826605e0c6b5d33b321aa7395b598041f1459fb361773688255c0ff1e4e300d05aef18aa42f5e785a8e7
 SHA512 
621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235
+DIST qttools-everywhere-src-6.7.0.tar.xz 9012572 BLAKE2B 
12bfc43d390c40faafdf825d48fb1672eb52c3f1e47ea0362542712dfac56fa3b07f01a2bc196872a04e9cf1a101ea2feb4ed6b744a70c75b67111ec806e
 SHA512 
8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560

diff --git a/dev-qt/qttools/qttools-6.7.0.ebuild 
b/dev-qt/qttools/qttools-6.7.0.ebuild
new file mode 100644
index ..6156f4c02a83
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.7.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+RESTRICT="test"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+   $(usev designer 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-02 Thread Arthur Zamarin
commit: aaf9edb70425f46c0d3511503230bbdcd55d8b9f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr  2 05:55:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr  2 05:55:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf9edb7

dev-qt/qttools: Stabilize 6.6.3 arm64, #928382

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.3.ebuild 
b/dev-qt/qttools/qttools-6.6.3.ebuild
index 437ceea8c978..19facb63a427 100644
--- a/dev-qt/qttools/qttools-6.6.3.ebuild
+++ b/dev-qt/qttools/qttools-6.6.3.ebuild
@@ -10,7 +10,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-04-01 Thread Arthur Zamarin
commit: b4f66b6c8c53d9a7a9afcc9dd969e4acf22d41e2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr  1 18:28:04 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr  1 18:28:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f66b6c

dev-qt/qttools: Stabilize 6.6.3 amd64, #928382

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.3.ebuild 
b/dev-qt/qttools/qttools-6.6.3.ebuild
index db9c412f9118..437ceea8c978 100644
--- a/dev-qt/qttools/qttools-6.6.3.ebuild
+++ b/dev-qt/qttools/qttools-6.6.3.ebuild
@@ -10,7 +10,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-29 Thread Ionen Wolkens
commit: d0193f9497a4c5091c3b376eb163dc73070722ff
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 29 22:16:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 30 00:27:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0193f94

dev-qt/qttools: drop 6.6.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6..ebuild | 153 -
 1 file changed, 153 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
deleted file mode 100644
index db9c412f9118..
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
-IUSE="
-   +assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# 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 )
-   qdoc? ( clang qml )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
-RDEPEND="
-   ~dev-qt/qtbase-${PV}:6[network,widgets?]
-   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-   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:= )
-   )
-   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
-   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-   ${RDEPEND}
-   qtdiag? (
-   vulkan? ( dev-util/vulkan-headers )
-   )
-"
-
-pkg_setup() {
-   use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # prevent the clang test as it can abort due to bug #916098
-   $(cmake_use_find_package clang WrapLibClang)
-   $(cmake_use_find_package qml Qt6Qml)
-   $(cmake_use_find_package widgets Qt6Widgets)
-   $(qt_feature assistant)
-   $(qt_feature clang)
-   $(qt_feature designer)
-   $(qt_feature distancefieldgenerator)
-   $(qt_feature linguist)
-   $(qt_feature pixeltool)
-   $(qt_feature qdbus)
-   $(qt_feature qdoc)
-   $(qt_feature qtattributionsscanner)
-   $(qt_feature qtdiag)
-   $(qt_feature qtplugininfo)
-
-   # TODO?: package litehtml, but support for latest releases seem
-   # to lag behind and bundled may work out better for now
-   # https://github.com/litehtml/litehtml/issues/266
-   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-   $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build 
(QTBUG-122634)
-   )
-
-   qt6-build_src_configure
-}
-
-src_install() {
-   qt6-build_src_install
-
-   if use widgets; then #914766
-   use designer || use distancefieldgenerator || use pixeltool &&
-   newicon src/designer/src/designer/images/designer.png 
designer6.png
-
-   if use assistant; then
-   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
-   'Qt;Development;Documentation' \
-   'Comment=Tool for viewing online documentation 
in Qt help file format'
-   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
-   fi
-
-   if use designer; then
-   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-   'Qt;Development;GUIDesigner' \
-   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
-   fi
-
-   if use distancefieldgenerator; then
-   # no icon, sharing with designer which 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-26 Thread Ionen Wolkens
commit: 9f956bf0afc147c3774076cff6894d3f061f4ba3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 26 06:39:54 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 26 07:08:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f956bf0

dev-qt/qttools: add 6.6.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.6.3.ebuild | 153 
 2 files changed, 154 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index fa3429c1686a..d4ed2dbb33b2 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
+DIST qttools-everywhere-src-6.6.3.tar.xz 8596272 BLAKE2B 
375a018d3fff0ef52e7e8e38455f8a801d6a4e715f14826605e0c6b5d33b321aa7395b598041f1459fb361773688255c0ff1e4e300d05aef18aa42f5e785a8e7
 SHA512 
621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235
 DIST qttools-everywhere-src-6.7.0-rc2.tar.xz 9013380 BLAKE2B 
f6b9b83af390f3c2f851dc8e99ae6a045752a77f9878a1c096c35a034515680d27e65ca3ccf6d558de74804eb82f1a1c2e92377db1de014581685f44d05cb5ce
 SHA512 
23b8a88397f89d1aaf80495d15bc34d3ebc54ef14097065bb2c013d4c408407a24fcc901b0c2691c2bec758309bea8f3c53be551960e58255b2e3858b817e3af

diff --git a/dev-qt/qttools/qttools-6.6.3.ebuild 
b/dev-qt/qttools/qttools-6.6.3.ebuild
new file mode 100644
index ..db9c412f9118
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+RESTRICT="test"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+   $(usev designer -DQT_UNITY_BUILD=OFF) # 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-25 Thread Ionen Wolkens
commit: a6384fca82440e73ee4ea2b71c192eed0fbda5d3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Mar 25 08:30:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Mar 25 22:09:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6384fca

dev-qt/qttools: add missing := to 6.6. for llvm

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 6b0169168b8d..db9c412f9118 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -39,8 +39,8 @@ RDEPEND="
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? (
$(llvm_gen_dep '
-   sys-devel/clang:${LLVM_SLOT}
-   sys-devel/llvm:${LLVM_SLOT}
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
')
)
designer? (



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-24 Thread Ionen Wolkens
commit: e3c3e074d776f17d32af0398dd4a48b39db94c25
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 12:15:24 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 18:37:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c3e074

dev-qt/qttools: drop 6.7.0_rc

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest|   1 -
 dev-qt/qttools/qttools-6.7.0_rc.ebuild | 153 -
 2 files changed, 154 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index a991526e4e53..fa3429c1686a 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
-DIST qttools-everywhere-src-6.7.0-rc.tar.xz 9013896 BLAKE2B 
710ecb68643730d87b7810e6cbadbac9750dc05886ceb712803c94b5736e96c716e654715950f3c23240fd297182dca7e7e97037e373894fb7d4bb32c46a
 SHA512 
3e74ac9a22ecf3474f9b47f3c6dc7ad70ceebf6718f2c3bb8d92276286d0283a961f4cdaee553474de429081c50e919e462aefc7abb109d5fd77a977f7d5301e
 DIST qttools-everywhere-src-6.7.0-rc2.tar.xz 9013380 BLAKE2B 
f6b9b83af390f3c2f851dc8e99ae6a045752a77f9878a1c096c35a034515680d27e65ca3ccf6d558de74804eb82f1a1c2e92377db1de014581685f44d05cb5ce
 SHA512 
23b8a88397f89d1aaf80495d15bc34d3ebc54ef14097065bb2c013d4c408407a24fcc901b0c2691c2bec758309bea8f3c53be551960e58255b2e3858b817e3af

diff --git a/dev-qt/qttools/qttools-6.7.0_rc.ebuild 
b/dev-qt/qttools/qttools-6.7.0_rc.ebuild
deleted file mode 100644
index 6156f4c02a83..
--- a/dev-qt/qttools/qttools-6.7.0_rc.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
-LLVM_OPTIONAL=1
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-fi
-
-IUSE="
-   +assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# 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 )
-   qdoc? ( clang qml )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
-RDEPEND="
-   ~dev-qt/qtbase-${PV}:6[network,widgets?]
-   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-   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:= )
-   )
-   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
-   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-   ${RDEPEND}
-   qtdiag? (
-   vulkan? ( dev-util/vulkan-headers )
-   )
-"
-
-pkg_setup() {
-   use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # prevent the clang test as it can abort due to bug #916098
-   $(cmake_use_find_package clang WrapLibClang)
-   $(cmake_use_find_package qml Qt6Qml)
-   $(cmake_use_find_package widgets Qt6Widgets)
-   $(qt_feature assistant)
-   $(qt_feature clang)
-   $(qt_feature designer)
-   $(qt_feature distancefieldgenerator)
-   $(qt_feature linguist)
-   $(qt_feature pixeltool)
-   $(qt_feature qdbus)
-   $(qt_feature qdoc)
-   $(qt_feature qtattributionsscanner)
-   $(qt_feature qtdiag)
-   $(qt_feature qtplugininfo)
-
-   # TODO?: package litehtml, but support for latest releases seem
-   # to lag behind and bundled may work out better for now
-   # https://github.com/litehtml/litehtml/issues/266
-   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-22 Thread Ionen Wolkens
commit: 1dbc618dd103bdea6f012a56da2e9b8cd4601217
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 08:34:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 10:28:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbc618d

dev-qt/qttools: add 6.7.0_rc2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.7.0_rc2.ebuild | 153 
 2 files changed, 154 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 7b9ee2a8977e..a991526e4e53 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
 DIST qttools-everywhere-src-6.7.0-rc.tar.xz 9013896 BLAKE2B 
710ecb68643730d87b7810e6cbadbac9750dc05886ceb712803c94b5736e96c716e654715950f3c23240fd297182dca7e7e97037e373894fb7d4bb32c46a
 SHA512 
3e74ac9a22ecf3474f9b47f3c6dc7ad70ceebf6718f2c3bb8d92276286d0283a961f4cdaee553474de429081c50e919e462aefc7abb109d5fd77a977f7d5301e
+DIST qttools-everywhere-src-6.7.0-rc2.tar.xz 9013380 BLAKE2B 
f6b9b83af390f3c2f851dc8e99ae6a045752a77f9878a1c096c35a034515680d27e65ca3ccf6d558de74804eb82f1a1c2e92377db1de014581685f44d05cb5ce
 SHA512 
23b8a88397f89d1aaf80495d15bc34d3ebc54ef14097065bb2c013d4c408407a24fcc901b0c2691c2bec758309bea8f3c53be551960e58255b2e3858b817e3af

diff --git a/dev-qt/qttools/qttools-6.7.0_rc2.ebuild 
b/dev-qt/qttools/qttools-6.7.0_rc2.ebuild
new file mode 100644
index ..6156f4c02a83
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.7.0_rc2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+RESTRICT="test"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+  

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-22 Thread Arthur Zamarin
commit: 3da1becb099ae67076d7e080cbe72b1bd76863fe
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 22 06:15:13 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 22 06:15:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da1becb

dev-qt/qttools: Stabilize 6.6.2 arm64, #927197

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
index b590e568ee91..8b4db6721996 100644
--- a/dev-qt/qttools/qttools-6.6.2.ebuild
+++ b/dev-qt/qttools/qttools-6.6.2.ebuild
@@ -10,7 +10,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-12 Thread Ionen Wolkens
commit: 0bcf4a89956158edae5001963aaeed0c6ed37d5d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 12 10:32:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 11:59:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcf4a89

dev-qt/qttools: add 6.7.0_rc

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest|   1 +
 dev-qt/qttools/qttools-6.7.0_rc.ebuild | 153 +
 2 files changed, 154 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 135f5bcd15f7..7b9ee2a8977e 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90
+DIST qttools-everywhere-src-6.7.0-rc.tar.xz 9013896 BLAKE2B 
710ecb68643730d87b7810e6cbadbac9750dc05886ceb712803c94b5736e96c716e654715950f3c23240fd297182dca7e7e97037e373894fb7d4bb32c46a
 SHA512 
3e74ac9a22ecf3474f9b47f3c6dc7ad70ceebf6718f2c3bb8d92276286d0283a961f4cdaee553474de429081c50e919e462aefc7abb109d5fd77a977f7d5301e

diff --git a/dev-qt/qttools/qttools-6.7.0_rc.ebuild 
b/dev-qt/qttools/qttools-6.7.0_rc.ebuild
new file mode 100644
index ..6156f4c02a83
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.7.0_rc.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+RESTRICT="test"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+   $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build 
(QTBUG-122634)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-03-07 Thread Ionen Wolkens
commit: 00fab6132aa19dba0e3d0640c2a498dc671a28eb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Mar  7 20:41:52 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Mar  7 20:45:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fab613

dev-qt/qttools: enable qdbus USE by default

Not that many revdeps (yet) beside 3 kde/plasma packages, but is
rather trivial to build and only needs qtbase[dbus,xml] which are
already default. Feel it's not worth being profile-specific.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6.2.ebuild| 2 +-
 dev-qt/qttools/qttools-6.6..ebuild | 2 +-
 dev-qt/qttools/qttools-6.7..ebuild | 2 +-
 dev-qt/qttools/qttools-6..ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
index 1b00112f08e6..b590e568ee91 100644
--- a/dev-qt/qttools/qttools-6.6.2.ebuild
+++ b/dev-qt/qttools/qttools-6.6.2.ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="
+assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "
 # note that some tools do not *require* widgets but will skip a sub-tool

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 49dfe820f8ac..df27a0546248 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="
+assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "
 # note that some tools do not *require* widgets but will skip a sub-tool

diff --git a/dev-qt/qttools/qttools-6.7..ebuild 
b/dev-qt/qttools/qttools-6.7..ebuild
index da3b0ac4c251..f71abecec56e 100644
--- a/dev-qt/qttools/qttools-6.7..ebuild
+++ b/dev-qt/qttools/qttools-6.7..ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="
+assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "
 # note that some tools do not *require* widgets but will skip a sub-tool

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index da3b0ac4c251..f71abecec56e 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="
+assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "
 # note that some tools do not *require* widgets but will skip a sub-tool



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-02-21 Thread Ionen Wolkens
commit: ff87bdd01f194226477164b68b1e908ea56a2694
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 22 04:47:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 22 06:14:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff87bdd0

dev-qt/qttools: use := to match upcoming llvm-r1 changes

Currently ommited in the llvm-r1 example, but that's being changed
and >=llvm-18.1.0_rc3 will use $(ver_cut 1-2) as subslot.

No need for a revbump (slot 18 is still masked either way).

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6.2.ebuild| 4 ++--
 dev-qt/qttools/qttools-6.7..ebuild | 4 ++--
 dev-qt/qttools/qttools-6..ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
index 67ef2ac9f6e6..1b00112f08e6 100644
--- a/dev-qt/qttools/qttools-6.6.2.ebuild
+++ b/dev-qt/qttools/qttools-6.6.2.ebuild
@@ -39,8 +39,8 @@ RDEPEND="
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? (
$(llvm_gen_dep '
-   sys-devel/clang:${LLVM_SLOT}
-   sys-devel/llvm:${LLVM_SLOT}
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
')
)
designer? (

diff --git a/dev-qt/qttools/qttools-6.7..ebuild 
b/dev-qt/qttools/qttools-6.7..ebuild
index 99231843045d..da3b0ac4c251 100644
--- a/dev-qt/qttools/qttools-6.7..ebuild
+++ b/dev-qt/qttools/qttools-6.7..ebuild
@@ -39,8 +39,8 @@ RDEPEND="
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? (
$(llvm_gen_dep '
-   sys-devel/clang:${LLVM_SLOT}
-   sys-devel/llvm:${LLVM_SLOT}
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
')
)
designer? (

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 99231843045d..da3b0ac4c251 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -39,8 +39,8 @@ RDEPEND="
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? (
$(llvm_gen_dep '
-   sys-devel/clang:${LLVM_SLOT}
-   sys-devel/llvm:${LLVM_SLOT}
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
')
)
designer? (



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-02-20 Thread Arthur Zamarin
commit: 5ee39ff015177f8b6a289f0115558f6530b59b34
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Feb 20 06:44:43 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Feb 20 14:30:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee39ff0

dev-qt/qttools: Stabilize 6.6.2 amd64, #924651

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
index 49dfe820f8ac..67ef2ac9f6e6 100644
--- a/dev-qt/qttools/qttools-6.6.2.ebuild
+++ b/dev-qt/qttools/qttools-6.6.2.ebuild
@@ -10,7 +10,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-02-14 Thread Ionen Wolkens
commit: 3d44500fb0888bf7bb454fc7d6295f8d7a06a37f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Feb 14 11:07:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Feb 14 12:20:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d44500f

dev-qt/qttools: add 6.6.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.6.2.ebuild | 151 
 2 files changed, 152 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index ba1f9f0b92ca..f432c251ad0b 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.6.1.tar.xz 8583536 BLAKE2B 
c52fd1643f925909c2e5f677574ee202c0de5b810e9ca603f27511b123ce570c4bbf4aa3efd2c4347dace91d92546f5cb90e7ca783b7182369d13dcdbdac2db4
 SHA512 
7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909
+DIST qttools-everywhere-src-6.6.2.tar.xz 8594492 BLAKE2B 
17d4385df9c0a70e8c3c135bd56f835c80d98008694331a2c2e8381b1489aafd56ca140ad300d868bdf795742326771358fc18f9c4e27b9aceb937a59536ddd9
 SHA512 
bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90

diff --git a/dev-qt/qttools/qttools-6.6.2.ebuild 
b/dev-qt/qttools/qttools-6.6.2.ebuild
new file mode 100644
index ..49dfe820f8ac
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# 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 )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+RESTRICT="test"
+
+RDEPEND="
+   ~dev-qt/qtbase-${PV}:6[network,widgets?]
+   assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+   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:= )
+   )
+   qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+   qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+   widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
+
+pkg_setup() {
+   use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
+   $(cmake_use_find_package qml Qt6Qml)
+   $(cmake_use_find_package widgets Qt6Widgets)
+   $(qt_feature assistant)
+   $(qt_feature clang)
+   $(qt_feature designer)
+   $(qt_feature distancefieldgenerator)
+   $(qt_feature linguist)
+   $(qt_feature pixeltool)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc)
+   $(qt_feature qtattributionsscanner)
+   $(qt_feature qtdiag)
+   $(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2024-02-10 Thread Ionen Wolkens
commit: 930c2dbfeee49f7a1210af8f619a3ab64df723b9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb  9 10:15:34 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 10 11:24:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930c2dbf

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

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. 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  gentoo.org>

 dev-qt/qttools/qttools-6.6..ebuild | 19 +++
 dev-qt/qttools/qttools-6.7..ebuild | 19 +--
 dev-qt/qttools/qttools-6..ebuild   | 19 +--
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 9f6085643a94..49dfe820f8ac 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..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? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-19 Thread Ionen Wolkens
commit: 868eb2f035e89ec40f7c0cb71810d2c32536b3ef
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 19 19:40:44 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 19 20:31:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868eb2f0

dev-qt/qttools: drop 6.5.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 -
 dev-qt/qttools/qttools-6.5.3.ebuild | 143 
 2 files changed, 144 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index fdf4bf178faa..ba1f9f0b92ca 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.5.3.tar.xz 8591996 BLAKE2B 
072b0b49182fac824364e7ac71df5698009ce0e8f144422c752373e122c587f6bdb306c2bb605c39228d8d5a1c1e0a89c8d56daef5f3de1cbb66aeb53e036962
 SHA512 
7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b
 DIST qttools-everywhere-src-6.6.1.tar.xz 8583536 BLAKE2B 
c52fd1643f925909c2e5f677574ee202c0de5b810e9ca603f27511b123ce570c4bbf4aa3efd2c4347dace91d92546f5cb90e7ca783b7182369d13dcdbdac2db4
 SHA512 
7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909

diff --git a/dev-qt/qttools/qttools-6.5.3.ebuild 
b/dev-qt/qttools/qttools-6.5.3.ebuild
deleted file mode 100644
index 679892cbe83a..
--- a/dev-qt/qttools/qttools-6.5.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop llvm optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
-fi
-
-IUSE="
-   +assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-   assistant? ( widgets )
-   designer? ( qml widgets )
-   distancefieldgenerator? ( qml widgets )
-   pixeltool? ( widgets )
-   qdoc? ( clang )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# 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? ( https://github.com/litehtml/litehtml/issues/266
-   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-   )
-
-   qt6-build_src_configure
-}
-
-src_install() {
-   qt6-build_src_install
-
-   if use widgets; then #914766
-   use designer || use distancefieldgenerator || use pixeltool &&
-   newicon src/designer/src/designer/images/designer.png 
designer6.png
-
-   if use assistant; then
-   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
-   'Qt;Development;Documentation' \
-   'Comment=Tool for viewing online documentation 
in Qt help file format'
-   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
-   fi
-
-   if use designer; then
-   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-   'Qt;Development;GUIDesigner' \
-   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
-   fi
-
-   if use distancefieldgenerator; then
-   # no icon, sharing with designer which fits letter-wise
-   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
-   'Qt;Development' \
-   'Comment=Tool for pregenerating the font cache 
of Qt applications'
-   fi
-
-   if use linguist; then
-   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-   'Qt;Development;Translation' \
-   'Comment=Tool for translating Qt applications'
-   newicon 
src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
-   fi
-
-   if use pixeltool; then
-   # no icon, not fitting but share with designer for now
-   make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' 
designer6 \
-   'Qt;Development' \
-  

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-19 Thread Ionen Wolkens
commit: 624edb4460ccd6211cd71bde1f850810c3f3fa1d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 19 15:05:49 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 19 15:14:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624edb44

dev-qt/qttools: disable clang test with USE=-clang

Normally harmless (tries to find it, either does or not and will not
use it either way), but if the cmake files are in broken state then
it can abort entirely.

Unsure if it fully resolves bug #916098 (for portage, ideally these
should still be updated "together" as much as possible), but at least
should not trigger on qttools anymore for those not enabling clang
(tested by intentionally breaking llvm's cmake files).

Closes: https://bugs.gentoo.org/916098
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6.1.ebuild| 2 ++
 dev-qt/qttools/qttools-6.6..ebuild | 2 ++
 dev-qt/qttools/qttools-6.7..ebuild | 2 ++
 dev-qt/qttools/qttools-6..ebuild   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index d5c8a41dc777..ef4f14675dbd 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -62,6 +62,8 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 8966bdc9123b..11611e815135 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -62,6 +62,8 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6.7..ebuild 
b/dev-qt/qttools/qttools-6.7..ebuild
index c171114332af..37d743692e22 100644
--- a/dev-qt/qttools/qttools-6.7..ebuild
+++ b/dev-qt/qttools/qttools-6.7..ebuild
@@ -66,6 +66,8 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index c171114332af..37d743692e22 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -66,6 +66,8 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   # prevent the clang test as it can abort due to bug #916098
+   $(cmake_use_find_package clang WrapLibClang)
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-17 Thread Arthur Zamarin
commit: efcb9df01234be90f3b1c816986d1774108ff036
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efcb9df0

dev-qt/qttools: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index 814fed85840e..d5c8a41dc777 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-12 Thread Ionen Wolkens
commit: 2bd1c5bb1af44133edd194579f9f8cc3c9578b70
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 12 14:29:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 12 21:23:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd1c5bb

dev-qt/qttools: add 6.7.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.7..ebuild | 150 +
 1 file changed, 150 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.7..ebuild 
b/dev-qt/qttools/qttools-6.7..ebuild
new file mode 100644
index ..c171114332af
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.7..ebuild
@@ -0,0 +1,150 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop llvm optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+   assistant? ( widgets )
+   designer? ( qml widgets )
+   distancefieldgenerator? ( qml widgets )
+   pixeltool? ( widgets )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# 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? (
+   https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
+   'Qt;Development;Documentation' \
+   'Comment=Tool for viewing online documentation 
in Qt help file format'
+   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
+   fi
+
+   if use designer; then
+   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+   'Qt;Development;GUIDesigner' \
+   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
+   fi
+
+   if use distancefieldgenerator; then
+   # no icon, sharing with designer which fits letter-wise
+   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
+   'Qt;Development' \
+   'Comment=Tool for pregenerating the font cache 
of Qt applications'
+   fi
+
+   if use linguist; then
+   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+   'Qt;Development;Translation' \
+   'Comment=Tool for translating Qt applications'
+   newicon 
src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
+   fi
+
+   if use pixeltool; then
+   # no icon, not fitting but share with designer for now
+   make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' 
designer6 \
+   'Qt;Development' \
+   'Comment=Tool for zooming in the desktop area 
pointed by the cursor'
+   fi
+
+   if use qdbus; then
+   make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' 
qdbusviewer6 \
+   'Qt;Development' \
+   'Comment=Tool that lets introspect D-Bus 
objects and messages'
+   newicon 
src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
+   fi
+
+   # hack: make_destop_entry does not support overriding 
DESCRIPTION
+   find "${ED}" -type f -name "*.desktop" \
+   -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
+   fi
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-01 Thread Jakov Smolić
commit: 16146191ac3b88b0913a7101c743c05620462635
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Dec  1 19:48:51 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Dec  1 19:48:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16146191

dev-qt/qttools: Keyword 6.6.1 riscv, #914026

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index 9f9b3b4170ee..814fed85840e 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-30 Thread Sam James
commit: 0c783b64f378591cba4f1890f489e668b4667f4c
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  1 06:20:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  1 06:20:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c783b64

dev-qt/qttools: Keyword 6.6.1 ppc64, #914026

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index 40b5691e3e9d..9f9b3b4170ee 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-30 Thread Sam James
commit: 3a97364728900c7c50824d9d71bae84ec40b88b4
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  1 06:20:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  1 06:20:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a973647

dev-qt/qttools: Keyword 6.6.1 sparc, #914026

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index c366d7c6d710..40b5691e3e9d 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-29 Thread Sam James
commit: 063b55db6fb62000a7c108000f201eb97c5802d1
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 29 22:32:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 29 22:32:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063b55db

dev-qt/qttools: Keyword 6.6.1 ppc, #914026

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index 8966bdc9123b..c366d7c6d710 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-27 Thread Ionen Wolkens
commit: d6e33f02e9a9ee4563ccd60a59335a36c0986697
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 27 06:11:07 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 27 08:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e33f02

dev-qt/qttools: add 6.6.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.6.1.ebuild | 146 
 2 files changed, 147 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index f60467b9a9ae..c92b4b16516d 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.5.3.tar.xz 8591996 BLAKE2B 
072b0b49182fac824364e7ac71df5698009ce0e8f144422c752373e122c587f6bdb306c2bb605c39228d8d5a1c1e0a89c8d56daef5f3de1cbb66aeb53e036962
 SHA512 
7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b
 DIST qttools-everywhere-src-6.6.0.tar.xz 8582212 BLAKE2B 
01c3cd188574dd2140756372d2aefb6e2c2dab1b866d2a120afb2fa19eff1eeeb288ae9845b55736bc77e8fb8173b2badaca091c9a7aa745fb1f2a0d864d191a
 SHA512 
42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652
+DIST qttools-everywhere-src-6.6.1.tar.xz 8583536 BLAKE2B 
c52fd1643f925909c2e5f677574ee202c0de5b810e9ca603f27511b123ce570c4bbf4aa3efd2c4347dace91d92546f5cb90e7ca783b7182369d13dcdbdac2db4
 SHA512 
7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
new file mode 100644
index ..8966bdc9123b
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop llvm optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+   assistant? ( widgets )
+   designer? ( qml widgets )
+   distancefieldgenerator? ( qml widgets )
+   pixeltool? ( widgets )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# 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? ( https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
+   'Qt;Development;Documentation' \
+   'Comment=Tool for viewing online documentation 
in Qt help file format'
+   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
+   fi
+
+   if use designer; then
+   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+   'Qt;Development;GUIDesigner' \
+   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
+   fi
+
+   if use distancefieldgenerator; then
+   # no icon, sharing with designer which fits letter-wise
+   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
+   'Qt;Development' \
+   'Comment=Tool for pregenerating the font cache 
of Qt applications'
+   fi
+
+   if use linguist; then
+   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+   'Qt;Development;Translation' \
+   'Comment=Tool for translating Qt applications'
+   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-15 Thread Ionen Wolkens
commit: d3d8d430ffe30c4556badd78de8a231f11d777a4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 15 18:00:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 15 19:27:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d8d430

dev-qt/qttools: drop 6.5.2-r2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest|   1 -
 dev-qt/qttools/qttools-6.5.2-r2.ebuild | 139 -
 2 files changed, 140 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 04835637ed66..f60467b9a9ae 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1,2 @@
-DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
 DIST qttools-everywhere-src-6.5.3.tar.xz 8591996 BLAKE2B 
072b0b49182fac824364e7ac71df5698009ce0e8f144422c752373e122c587f6bdb306c2bb605c39228d8d5a1c1e0a89c8d56daef5f3de1cbb66aeb53e036962
 SHA512 
7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b
 DIST qttools-everywhere-src-6.6.0.tar.xz 8582212 BLAKE2B 
01c3cd188574dd2140756372d2aefb6e2c2dab1b866d2a120afb2fa19eff1eeeb288ae9845b55736bc77e8fb8173b2badaca091c9a7aa745fb1f2a0d864d191a
 SHA512 
42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652

diff --git a/dev-qt/qttools/qttools-6.5.2-r2.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r2.ebuild
deleted file mode 100644
index eb3cbd1695fe..
--- a/dev-qt/qttools/qttools-6.5.2-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop llvm optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
-fi
-
-IUSE="
-   +assistant clang designer distancefieldgenerator gles2-only
-   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-   assistant? ( widgets )
-   designer? ( qml widgets )
-   distancefieldgenerator? ( qml widgets )
-   pixeltool? ( widgets )
-   qdoc? ( clang )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# 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? ( https://github.com/litehtml/litehtml/issues/266
-   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-   )
-
-   qt6-build_src_configure
-}
-
-src_install() {
-   qt6-build_src_install
-
-   if use widgets; then #914766
-   use designer || use distancefieldgenerator || use pixeltool &&
-   newicon src/designer/src/designer/images/designer.png 
designer6.png
-
-   if use assistant; then
-   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
-   'Qt;Development;Documentation' \
-   'Comment=Tool for viewing online documentation 
in Qt help file format'
-   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
-   fi
-
-   if use designer; then
-   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-   'Qt;Development;GUIDesigner' \
-   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
-   fi
-
-   if use distancefieldgenerator; then
-   # no icon, sharing with designer which fits letter-wise
-   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
-   'Qt;Development' \
-   'Comment=Tool for pregenerating the font cache 
of Qt applications'
-   fi
-
-   if use linguist; then
-   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-   'Qt;Development;Translation' \
-   'Comment=Tool for translating Qt applications'
-   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-11-15 Thread Arthur Zamarin
commit: df12e61f089b29f820f8d9a26768ab6fb0d4ad46
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 15 17:19:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 15 17:19:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df12e61f

dev-qt/qttools: Stabilize 6.5.3 amd64, #915549

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-qt/qttools/qttools-6.5.3.ebuild 
b/dev-qt/qttools/qttools-6.5.3.ebuild
index 2e307c55608d..679892cbe83a 100644
--- a/dev-qt/qttools/qttools-6.5.3.ebuild
+++ b/dev-qt/qttools/qttools-6.5.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-10-21 Thread Ionen Wolkens
commit: 6c76adccf74ec5c217e7d1b20e968db95590db62
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 22 05:46:29 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 22 05:49:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c76adcc

dev-qt/qttools: set llvm_check_deps

Forgot, albeit typically not an issue unless someone has an extra
llvm slot without clang.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.3.ebuild| 4 
 dev-qt/qttools/qttools-6.6.0.ebuild| 4 
 dev-qt/qttools/qttools-6.6..ebuild | 4 
 dev-qt/qttools/qttools-6..ebuild   | 4 
 4 files changed, 16 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.5.3.ebuild 
b/dev-qt/qttools/qttools-6.5.3.ebuild
index a0a32fd588c3..2e307c55608d 100644
--- a/dev-qt/qttools/qttools-6.5.3.ebuild
+++ b/dev-qt/qttools/qttools-6.5.3.ebuild
@@ -49,6 +49,10 @@ DEPEND="
)
 "
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
use clang && llvm_pkg_setup
 }

diff --git a/dev-qt/qttools/qttools-6.6.0.ebuild 
b/dev-qt/qttools/qttools-6.6.0.ebuild
index 58cbf93bb7d2..8966bdc9123b 100644
--- a/dev-qt/qttools/qttools-6.6.0.ebuild
+++ b/dev-qt/qttools/qttools-6.6.0.ebuild
@@ -52,6 +52,10 @@ DEPEND="
)
 "
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
use clang && llvm_pkg_setup
 }

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 58cbf93bb7d2..8966bdc9123b 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -52,6 +52,10 @@ DEPEND="
)
 "
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
use clang && llvm_pkg_setup
 }

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 58cbf93bb7d2..8966bdc9123b 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -52,6 +52,10 @@ DEPEND="
)
 "
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
use clang && llvm_pkg_setup
 }



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-10-10 Thread Ionen Wolkens
commit: 72376f0bbd5359732c106c263a294c6c96dfbe75
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 10 08:56:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 10 14:49:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72376f0b

dev-qt/qttools: add 6.6.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.6.0.ebuild | 142 
 2 files changed, 143 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 8a584a4717e9..04835637ed66 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
 DIST qttools-everywhere-src-6.5.3.tar.xz 8591996 BLAKE2B 
072b0b49182fac824364e7ac71df5698009ce0e8f144422c752373e122c587f6bdb306c2bb605c39228d8d5a1c1e0a89c8d56daef5f3de1cbb66aeb53e036962
 SHA512 
7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b
+DIST qttools-everywhere-src-6.6.0.tar.xz 8582212 BLAKE2B 
01c3cd188574dd2140756372d2aefb6e2c2dab1b866d2a120afb2fa19eff1eeeb288ae9845b55736bc77e8fb8173b2badaca091c9a7aa745fb1f2a0d864d191a
 SHA512 
42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652

diff --git a/dev-qt/qttools/qttools-6.6.0.ebuild 
b/dev-qt/qttools/qttools-6.6.0.ebuild
new file mode 100644
index ..58cbf93bb7d2
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop llvm optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+   assistant? ( widgets )
+   designer? ( qml widgets )
+   distancefieldgenerator? ( qml widgets )
+   pixeltool? ( widgets )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# 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? ( https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
+   'Qt;Development;Documentation' \
+   'Comment=Tool for viewing online documentation 
in Qt help file format'
+   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
+   fi
+
+   if use designer; then
+   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+   'Qt;Development;GUIDesigner' \
+   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
+   fi
+
+   if use distancefieldgenerator; then
+   # no icon, sharing with designer which fits letter-wise
+   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
+   'Qt;Development' \
+   'Comment=Tool for pregenerating the font cache 
of Qt applications'
+   fi
+
+   if use linguist; then
+   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+   'Qt;Development;Translation' \
+   'Comment=Tool for translating Qt applications'
+   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-29 Thread Ionen Wolkens
commit: aa54d3f8979d07d0eaed96d6f4223827d404df6b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 29 22:55:52 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 29 23:28:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa54d3f8

dev-qt/qttools: fix zstd dep in 6.6+

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild | 2 +-
 dev-qt/qttools/qttools-6.6..ebuild| 2 +-
 dev-qt/qttools/qttools-6..ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild 
b/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild
index 16d3014acad0..58cbf93bb7d2 100644
--- a/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild
@@ -37,8 +37,8 @@ RDEPEND="
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-28 Thread Ionen Wolkens
commit: 6059fcbdbb4247e9cb1c6d67d653952853b01896
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep 28 07:02:38 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep 28 12:31:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6059fcbd

dev-qt/qttools: add 6.5.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest |   1 +
 dev-qt/qttools/qttools-6.5.3.ebuild | 139 
 2 files changed, 140 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index d712d6b68225..a4a796cabfff 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1,3 @@
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
+DIST qttools-everywhere-src-6.5.3.tar.xz 8591996 BLAKE2B 
072b0b49182fac824364e7ac71df5698009ce0e8f144422c752373e122c587f6bdb306c2bb605c39228d8d5a1c1e0a89c8d56daef5f3de1cbb66aeb53e036962
 SHA512 
7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b
 DIST qttools-everywhere-src-6.6.0-rc.tar.xz 8583520 BLAKE2B 
b0b62af296e74afd7862f949f0a47b284b49272f3104cf2e0106b6853695178de52288affd092c02db00f1763c667cdcd284c05d1aada16420198a97804e565c
 SHA512 
613179db00fe5335a2d65fb74ad22b8c20bcd0d1d8fa154196f8885a19e9b14bda0092550696b15d72808cfed341bac55175e82e7f833b23386079a8f8f7860a

diff --git a/dev-qt/qttools/qttools-6.5.3.ebuild 
b/dev-qt/qttools/qttools-6.5.3.ebuild
new file mode 100644
index ..a0a32fd588c3
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.5.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop llvm optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+   assistant? ( widgets )
+   designer? ( qml widgets )
+   distancefieldgenerator? ( qml widgets )
+   pixeltool? ( widgets )
+   qdoc? ( clang )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# 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? ( https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
+   'Qt;Development;Documentation' \
+   'Comment=Tool for viewing online documentation 
in Qt help file format'
+   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
+   fi
+
+   if use designer; then
+   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+   'Qt;Development;GUIDesigner' \
+   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
+   fi
+
+   if use distancefieldgenerator; then
+   # no icon, sharing with designer which fits letter-wise
+   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
+   'Qt;Development' \
+   'Comment=Tool for pregenerating the font cache 
of Qt applications'
+   fi
+
+   if use linguist; then
+   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+   'Qt;Development;Translation' \
+   'Comment=Tool for translating Qt applications'
+   newicon 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-27 Thread Ionen Wolkens
commit: 127ad8aa388e6a12906775f3353c6612556d2089
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 27 09:54:14 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 27 10:03:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127ad8aa

dev-qt/qttools: note that USE=assistant provides QtHelp

Primarily to advertise to revdeps that if they want QtHelp,
they are not wrong to depend on this USE (which is enabled
by default).

Would be nicer if split off for clarity but the build system
complicates things, and assistant itself is fairly small and
adds no dependencies that QtHelp itself does not need.

Signed-off-by: Ionen Wolkens  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 ce7dba6ed80a..80f6a033c31d 100644
--- a/dev-qt/qttools/metadata.xml
+++ b/dev-qt/qttools/metadata.xml
@@ -6,7 +6,7 @@
Gentoo Qt Project


-   Build Qt Assistant
+   Build Qt Assistant and the QtHelp 
module
Enable using libclang for code parsing 
(linguist/qdoc)
Build Qt Designer
Build Qt Distance Field 
Generator



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-26 Thread Ionen Wolkens
commit: 6efbe0b4f1713563754986f128d973206c7bc011
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 22:26:53 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 23:07:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efbe0b4

dev-qt/qttools: install .desktop files

Not very worth a revbump considering 6.5.3 is around the corner,
but does not hurt to have it for stable early as this just should
not be missing.

Descriptions and categories may need extra work, but should do
for now.

Also sync with live while revbumping.

Closes: https://bugs.gentoo.org/914766
Signed-off-by: Ionen Wolkens  gentoo.org>

 ...ols-6.5.2-r1.ebuild => qttools-6.5.2-r2.ebuild} | 58 +-
 dev-qt/qttools/qttools-6.5..ebuild | 56 -
 ...-6.6.0_rc.ebuild => qttools-6.6.0_rc-r1.ebuild} | 56 -
 dev-qt/qttools/qttools-6.6..ebuild | 56 -
 dev-qt/qttools/qttools-6..ebuild   | 56 -
 5 files changed, 276 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r2.ebuild
similarity index 52%
rename from dev-qt/qttools/qttools-6.5.2-r1.ebuild
rename to dev-qt/qttools/qttools-6.5.2-r2.ebuild
index a6ea17074dc0..eb3cbd1695fe 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit llvm optfeature qt6-build
+inherit desktop llvm optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator gles2-only
+   +assistant clang designer distancefieldgenerator gles2-only
+linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets
 "
@@ -78,6 +78,60 @@ src_configure() {
qt6-build_src_configure
 }
 
+src_install() {
+   qt6-build_src_install
+
+   if use widgets; then #914766
+   use designer || use distancefieldgenerator || use pixeltool &&
+   newicon src/designer/src/designer/images/designer.png 
designer6.png
+
+   if use assistant; then
+   make_desktop_entry assistant6 'Qt 6 Assistant' 
assistant6 \
+   'Qt;Development;Documentation' \
+   'Comment=Tool for viewing online documentation 
in Qt help file format'
+   newicon 
src/assistant/assistant/images/assistant-128.png assistant6.png
+   fi
+
+   if use designer; then
+   make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+   'Qt;Development;GUIDesigner' \
+   'Comment=WYSIWYG tool for designing and 
building graphical user interfaces with QtWidgets'
+   fi
+
+   if use distancefieldgenerator; then
+   # no icon, sharing with designer which fits letter-wise
+   make_desktop_entry qdistancefieldgenerator6 'Qt 6 
Distance Field Generator' designer6 \
+   'Qt;Development' \
+   'Comment=Tool for pregenerating the font cache 
of Qt applications'
+   fi
+
+   if use linguist; then
+   make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+   'Qt;Development;Translation' \
+   'Comment=Tool for translating Qt applications'
+   newicon 
src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
+   fi
+
+   if use pixeltool; then
+   # no icon, not fitting but share with designer for now
+   make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' 
designer6 \
+   'Qt;Development' \
+   'Comment=Tool for zooming in the desktop area 
pointed by the cursor'
+   fi
+
+   if use qdbus; then
+   make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' 
qdbusviewer6 \
+   'Qt;Development' \
+   'Comment=Tool that lets introspect D-Bus 
objects and messages'
+   newicon 
src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
+   fi
+
+   # hack: make_destop_entry does not support overriding 
DESCRIPTION
+   find "${ED}" -type f -name "*.desktop" \
+   -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
+   fi
+}
+
 pkg_postinst() {
use assistant &&
optfeature "Qt documentation viewable in assistant" \

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-26 Thread Ionen Wolkens
commit: c85a79c434ccc95e944483460628cfa07ed23e84
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 13:38:25 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 19:47:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85a79c4

dev-qt/qttools: add 6.6.0_rc

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/Manifest|  1 +
 dev-qt/qttools/qttools-6.6.0_rc.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 62db56b59314..d712d6b68225 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
+DIST qttools-everywhere-src-6.6.0-rc.tar.xz 8583520 BLAKE2B 
b0b62af296e74afd7862f949f0a47b284b49272f3104cf2e0106b6853695178de52288affd092c02db00f1763c667cdcd284c05d1aada16420198a97804e565c
 SHA512 
613179db00fe5335a2d65fb74ad22b8c20bcd0d1d8fa154196f8885a19e9b14bda0092550696b15d72808cfed341bac55175e82e7f833b23386079a8f8f7860a

diff --git a/dev-qt/qttools/qttools-6.6.0_rc.ebuild 
b/dev-qt/qttools/qttools-6.6.0_rc.ebuild
new file mode 100644
index ..68421695ed36
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.0_rc.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+fi
+
+IUSE="
+   +assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+   assistant? ( widgets )
+   designer? ( qml widgets )
+   distancefieldgenerator? ( qml widgets )
+   pixeltool? ( widgets )
+   qdoc? ( clang qml )
+"
+
+# behaves very badly when qttools is not already installed, also
+# other more minor issues (clang tests flaky depending on version,
+# 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? ( https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+   )
+
+   qt6-build_src_configure
+}
+
+pkg_postinst() {
+   use assistant &&
+   optfeature "Qt documentation viewable in assistant" \
+   'dev-qt/qt-docs:6[qch]' #602296
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/, dev-qt/qtshadertools/, dev-qt/qtwayland/, ...

2023-09-26 Thread Ionen Wolkens
commit: 457d9c8211c4d83eff78d9e23bfa9f75ff36d7ed
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 10:10:09 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 14:19:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457d9c82

dev-qt/*: sync live keywords (qt6)

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtbase/qtbase-6.5..ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.6..ebuild | 2 +-
 dev-qt/qtbase/qtbase-6..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-6.5..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-6.6..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-6..ebuild | 2 +-
 dev-qt/qtshadertools/qtshadertools-6.5..ebuild   | 2 +-
 dev-qt/qtshadertools/qtshadertools-6.6..ebuild   | 2 +-
 dev-qt/qtshadertools/qtshadertools-6..ebuild | 2 +-
 dev-qt/qttools/qttools-6.5..ebuild   | 2 +-
 dev-qt/qttools/qttools-6.6..ebuild   | 2 +-
 dev-qt/qttools/qttools-6..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-6.5..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-6.6..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-6..ebuild   | 2 +-
 dev-qt/qtwayland/qtwayland-6.5..ebuild   | 2 +-
 dev-qt/qtwayland/qtwayland-6.6..ebuild   | 2 +-
 dev-qt/qtwayland/qtwayland-6..ebuild | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.5..ebuild 
b/dev-qt/qtbase/qtbase-6.5..ebuild
index 595ac9251ec8..ff54e3219118 100644
--- a/dev-qt/qtbase/qtbase-6.5..ebuild
+++ b/dev-qt/qtbase/qtbase-6.5..ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 declare -A QT6_IUSE=(

diff --git a/dev-qt/qtbase/qtbase-6.6..ebuild 
b/dev-qt/qtbase/qtbase-6.6..ebuild
index 6949afbeb6f2..98b39111fafa 100644
--- a/dev-qt/qtbase/qtbase-6.6..ebuild
+++ b/dev-qt/qtbase/qtbase-6.6..ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 declare -A QT6_IUSE=(

diff --git a/dev-qt/qtbase/qtbase-6..ebuild 
b/dev-qt/qtbase/qtbase-6..ebuild
index bbd1e7bf6594..97f1bd56f733 100644
--- a/dev-qt/qtbase/qtbase-6..ebuild
+++ b/dev-qt/qtbase/qtbase-6..ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 declare -A QT6_IUSE=(

diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5..ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-6.5..ebuild
index 3999cb0c8aa1..52435728a5ae 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.5..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5..ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 IUSE="opengl +sql vulkan +widgets"

diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6..ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-6.6..ebuild
index 3999cb0c8aa1..52435728a5ae 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.6..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.6..ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 IUSE="opengl +sql vulkan +widgets"

diff --git a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild
index 3999cb0c8aa1..52435728a5ae 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 IUSE="opengl +sql vulkan +widgets"

diff --git a/dev-qt/qtshadertools/qtshadertools-6.5..ebuild 
b/dev-qt/qtshadertools/qtshadertools-6.5..ebuild
index 4d59fdfce0ca..1511276eb963 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.5..ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.5..ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-24 Thread Ionen Wolkens
commit: 1ccf81ebc62197a04a24b576a99d1f84b036bb12
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Sep 24 11:34:42 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 24 17:18:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ccf81eb

dev-qt/qttools: enable assistant by default in live

Provides QtHelp, and lacking that by default is likely to be
an annoyance given the amount of packages that previously
depended on dev-qt/qthelp:5. No urgency to trigger a rebuild,
so queue'ing it for next release.

Technically requires no extras assuming default IUSE on qtbase,
albeit may eventually pull litehtml if unbundled.

Unfortunately does mean that the optfeature will nag about
qt-docs when it is primarily intended for developers.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5..ebuild | 2 +-
 dev-qt/qttools/qttools-6.6..ebuild | 2 +-
 dev-qt/qttools/qttools-6..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index e0abea904e69..26477ec2eafa 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator gles2-only
+   +assistant clang designer distancefieldgenerator gles2-only
+linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets
 "

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 7242a7ca39ff..6c65c1eb914a 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator gles2-only
+   +assistant clang designer distancefieldgenerator gles2-only
+linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 7242a7ca39ff..6c65c1eb914a 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator gles2-only
+   +assistant clang designer distancefieldgenerator gles2-only
+linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
qtdiag qtplugininfo vulkan +widgets zstd
 "



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-24 Thread WANG Xuerui
commit: e1a19e32c45e942d9cb53880fa4e03921bb52fe4
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Sep 24 16:52:40 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Sep 24 17:05:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a19e32

dev-qt/qttools: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-qt/qttools/qttools-6.5..ebuild | 2 +-
 dev-qt/qttools/qttools-6.6..ebuild | 2 +-
 dev-qt/qttools/qttools-6..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index 295a69f8fd39..e0abea904e69 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 0e1eba0054cc..7242a7ca39ff 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 0e1eba0054cc..7242a7ca39ff 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-24 Thread WANG Xuerui
commit: d25e9ec9e0d383d3a0eb8a0c43b49abcd2926845
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Sep 24 16:52:38 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Sep 24 17:05:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25e9ec9

dev-qt/qttools: keyword 6.5.2-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 579c1e444eac..a6ea17074dc0 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-22 Thread Sam James
commit: 2897eb00a4bc8f917f5deebae92c263ff9757993
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 20:52:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 20:52:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2897eb00

dev-qt/qttools: Keyword 6.5.2-r1 hppa, #914026

Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 7b0d625a130c..579c1e444eac 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-14 Thread Sam James
commit: 1fc2f7f22a556326d258ef7d7fd7826afe2f92c2
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 15 04:47:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 15 04:47:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fc2f7f2

dev-qt/qttools: Stabilize 6.5.2-r1 amd64, #914113

Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 9120759d00ad..7b0d625a130c 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-13 Thread Ionen Wolkens
commit: 3837c5a91af6ad41d48b6ce9c4adf0c822ab6337
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 12 17:22:56 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 13 16:40:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3837c5a9

dev-qt/qttools: add IUSE=zstd to 6.6+

Based on qtbase configuration, so yet another annoying [match=].

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6..ebuild | 7 +--
 dev-qt/qttools/qttools-6..ebuild   | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 295a69f8fd39..490a140a2905 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -14,7 +14,7 @@ fi
 IUSE="
assistant clang designer distancefieldgenerator gles2-only
+linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
-   qtdiag qtplugininfo vulkan +widgets
+   qtdiag qtplugininfo vulkan +widgets zstd
 "
 # note that some tools do not *require* widgets but will skip a sub-tool
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -36,7 +36,10 @@ RDEPEND="
~dev-qt/qtbase-${PV}:6[network,widgets?]
assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
clang? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-13 Thread Ionen Wolkens
commit: 67e0030c162d2705133385b5829486588bd6b8df
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 13 13:42:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 13 16:40:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e0030c

dev-qt/qttools: update qdoc handling in 6.6+

Did suspect that qdoc would become its own option eventually.

It now also requires qml and clangcpp (on top of clang), not
that we really need to pass clangcpp feature given it does
no test and just mirrors the clang feature.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.6..ebuild | 6 +++---
 dev-qt/qttools/qttools-6..ebuild   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.6..ebuild 
b/dev-qt/qttools/qttools-6.6..ebuild
index 490a140a2905..0e1eba0054cc 100644
--- a/dev-qt/qttools/qttools-6.6..ebuild
+++ b/dev-qt/qttools/qttools-6.6..ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
designer? ( qml widgets )
distancefieldgenerator? ( qml widgets )
pixeltool? ( widgets )
-   qdoc? ( clang )
+   qdoc? ( clang qml )
 "
 
 # behaves very badly when qttools is not already installed, also
@@ -61,13 +61,13 @@ src_configure() {
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)
-   $(qt_feature clang clangcpp)
+   $(qt_feature clang)
$(qt_feature designer)
$(qt_feature distancefieldgenerator)
$(qt_feature linguist)
$(qt_feature pixeltool)
$(qt_feature qdbus)
-   $(qt_feature qdoc clang)
+   $(qt_feature qdoc)
$(qt_feature qtattributionsscanner)
$(qt_feature qtdiag)
$(qt_feature qtplugininfo)

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 490a140a2905..0e1eba0054cc 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
designer? ( qml widgets )
distancefieldgenerator? ( qml widgets )
pixeltool? ( widgets )
-   qdoc? ( clang )
+   qdoc? ( clang qml )
 "
 
 # behaves very badly when qttools is not already installed, also
@@ -61,13 +61,13 @@ src_configure() {
$(cmake_use_find_package qml Qt6Qml)
$(cmake_use_find_package widgets Qt6Widgets)
$(qt_feature assistant)
-   $(qt_feature clang clangcpp)
+   $(qt_feature clang)
$(qt_feature designer)
$(qt_feature distancefieldgenerator)
$(qt_feature linguist)
$(qt_feature pixeltool)
$(qt_feature qdbus)
-   $(qt_feature qdoc clang)
+   $(qt_feature qdoc)
$(qt_feature qtattributionsscanner)
$(qt_feature qtdiag)
$(qt_feature qtplugininfo)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Sam James
commit: c831fbaadfc3f1b5e4a1aa90df61b309c3d5d749
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 12 01:27:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 12 01:27:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c831fbaa

dev-qt/qttools: Keyword 6.5.2-r1 arm, #914026

Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 3b3ece3e87bd..9120759d00ad 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Sam James
commit: 23ebf054363858c4b96e850547a4f7128b8ba3ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 12 01:25:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 12 01:25:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ebf054

dev-qt/qttools: Keyword 6.5.2-r1 x86, #914026

Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 49b463bf5b21..3b3ece3e87bd 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Sam James
commit: abacc38962f5c15e217947f0115aebcb4afb46a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 11 22:58:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 11 22:58:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abacc389

dev-qt/qttools: Keyword 6.5.2-r1 arm64, #914026

Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 295a69f8fd39..49b463bf5b21 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~arm64"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Ionen Wolkens
commit: 918dcc75f40ae3dac04a39fde41f21df09131232
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep 11 09:35:46 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:03:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918dcc75

dev-qt/qttools: prevent litehtml automagic, add note

Not packaged so not really an issue, but if it is found odds are it
will end in build failure given this supports litehtml-0.6 and is
broken with (current) litehtml-0.8.

Thought this package it, but would rather wait until that's sorted out
rather than carry rather large patches. Not to mention need to patch
qt-creator for this as well, qlitehtml which wraps around it is not
setup to be unbundled.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 5 +
 dev-qt/qttools/qttools-6.5..ebuild | 5 +
 dev-qt/qttools/qttools-6..ebuild   | 5 +
 3 files changed, 15 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 51b9ae34316d..b3accb48d2c1 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -63,6 +63,11 @@ src_configure() {
$(qt_feature qtattributionsscanner)
$(qt_feature qtdiag)
$(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
)
 
qt6-build_src_configure

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index 51b9ae34316d..b3accb48d2c1 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -63,6 +63,11 @@ src_configure() {
$(qt_feature qtattributionsscanner)
$(qt_feature qtdiag)
$(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
)
 
qt6-build_src_configure

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 51b9ae34316d..b3accb48d2c1 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -63,6 +63,11 @@ src_configure() {
$(qt_feature qtattributionsscanner)
$(qt_feature qtdiag)
$(qt_feature qtplugininfo)
+
+   # TODO?: package litehtml, but support for latest releases seem
+   # to lag behind and bundled may work out better for now
+   # https://github.com/litehtml/litehtml/issues/266
+   $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
)
 
qt6-build_src_configure



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Ionen Wolkens
commit: 33cb72aa4767f9c9972539e8668da1a83472726e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep 11 10:02:54 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:03:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cb72aa

dev-qt/qttools: add vulkan-headers dep for qtdiag

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 7 ++-
 dev-qt/qttools/qttools-6.5..ebuild | 7 ++-
 dev-qt/qttools/qttools-6..ebuild   | 7 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index b3accb48d2c1..295a69f8fd39 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -42,7 +42,12 @@ RDEPEND="
qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
 
 pkg_setup() {
use clang && llvm_pkg_setup

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index b3accb48d2c1..295a69f8fd39 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -42,7 +42,12 @@ RDEPEND="
qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
 
 pkg_setup() {
use clang && llvm_pkg_setup

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index b3accb48d2c1..295a69f8fd39 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -42,7 +42,12 @@ RDEPEND="
qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   qtdiag? (
+   vulkan? ( dev-util/vulkan-headers )
+   )
+"
 
 pkg_setup() {
use clang && llvm_pkg_setup



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-11 Thread Ionen Wolkens
commit: 576d8d7e5f22d13fe727b76550a75889a20f7d17
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  9 17:41:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:03:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576d8d7e

dev-qt/qttools: check for [qch] on the qt-docs optfeature

This may bundle litehtml for QtHelp, but assistant does not seem
interested in using html docs over qch.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 2 +-
 dev-qt/qttools/qttools-6.5..ebuild | 2 +-
 dev-qt/qttools/qttools-6..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 243633446599..51b9ae34316d 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -71,5 +71,5 @@ src_configure() {
 pkg_postinst() {
use assistant &&
optfeature "Qt documentation viewable in assistant" \
-   dev-qt/qt-docs:6 #602296
+   'dev-qt/qt-docs:6[qch]' #602296
 }

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index 243633446599..51b9ae34316d 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -71,5 +71,5 @@ src_configure() {
 pkg_postinst() {
use assistant &&
optfeature "Qt documentation viewable in assistant" \
-   dev-qt/qt-docs:6 #602296
+   'dev-qt/qt-docs:6[qch]' #602296
 }

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 243633446599..51b9ae34316d 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -71,5 +71,5 @@ src_configure() {
 pkg_postinst() {
use assistant &&
optfeature "Qt documentation viewable in assistant" \
-   dev-qt/qt-docs:6 #602296
+   'dev-qt/qt-docs:6[qch]' #602296
 }



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-06 Thread Ionen Wolkens
commit: 34670ebc0790326e41f1e1a7ae29f71d9a6cdc29
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep  6 04:15:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  6 08:49:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34670ebc

dev-qt/qttools: optfeature on qt-docs with assistant (qt6)

Pulling by default does feel like a stretch, especially
given this also provides QtHelp in this unsplit qttools
and may just be pulled a dep.

But no harm in an optfeature.

Bug: https://bugs.gentoo.org/602296
Bug: https://bugs.gentoo.org/881435
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 8 +++-
 dev-qt/qttools/qttools-6.5..ebuild | 8 +++-
 dev-qt/qttools/qttools-6..ebuild   | 8 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 4c7d4b23fe7b..243633446599 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit llvm qt6-build
+inherit llvm optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -67,3 +67,9 @@ src_configure() {
 
qt6-build_src_configure
 }
+
+pkg_postinst() {
+   use assistant &&
+   optfeature "Qt documentation viewable in assistant" \
+   dev-qt/qt-docs:6 #602296
+}

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index 4c7d4b23fe7b..243633446599 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit llvm qt6-build
+inherit llvm optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -67,3 +67,9 @@ src_configure() {
 
qt6-build_src_configure
 }
+
+pkg_postinst() {
+   use assistant &&
+   optfeature "Qt documentation viewable in assistant" \
+   dev-qt/qt-docs:6 #602296
+}

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 4c7d4b23fe7b..243633446599 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit llvm qt6-build
+inherit llvm optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -67,3 +67,9 @@ src_configure() {
 
qt6-build_src_configure
 }
+
+pkg_postinst() {
+   use assistant &&
+   optfeature "Qt documentation viewable in assistant" \
+   dev-qt/qt-docs:6 #602296
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-09-05 Thread Ionen Wolkens
commit: 41dd954489280c04c1d8c9cf1fcfb0c612835ec6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep  4 19:51:17 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep  5 13:01:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dd9544

dev-qt/qttools: depend on qtbase[gles2-only=] for qtdiag

Same as opengl and vulkan, qtdiag has the whole slew of
QT_CONFIG that would break if qtbase disables support.

Albeit unfortunate with unsplit qttools given USE is a
no-op (like vulkan) unless qtdiag is enabled.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qttools/qttools-6.5.2-r1.ebuild | 8 
 dev-qt/qttools/qttools-6.5..ebuild | 8 
 dev-qt/qttools/qttools-6..ebuild   | 8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild 
b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild
+++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator +linguist
-   opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
-   qtplugininfo vulkan +widgets
+   assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets
 "
 # note that some tools do not *require* widgets but will skip a sub-tool
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="${RDEPEND}"

diff --git a/dev-qt/qttools/qttools-6.5..ebuild 
b/dev-qt/qttools/qttools-6.5..ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6.5..ebuild
+++ b/dev-qt/qttools/qttools-6.5..ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator +linguist
-   opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
-   qtplugininfo vulkan +widgets
+   assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets
 "
 # note that some tools do not *require* widgets but will skip a sub-tool
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="${RDEPEND}"

diff --git a/dev-qt/qttools/qttools-6..ebuild 
b/dev-qt/qttools/qttools-6..ebuild
index 7c33c8b042a1..4c7d4b23fe7b 100644
--- a/dev-qt/qttools/qttools-6..ebuild
+++ b/dev-qt/qttools/qttools-6..ebuild
@@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-   assistant clang designer distancefieldgenerator +linguist
-   opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag
-   qtplugininfo vulkan +widgets
+   assistant clang designer distancefieldgenerator gles2-only
+   +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner
+   qtdiag qtplugininfo vulkan +widgets
 "
 # note that some tools do not *require* widgets but will skip a sub-tool
 # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
@@ -39,7 +39,7 @@ RDEPEND="
designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-   qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] )
+   qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-07-26 Thread Jimi Huotari
commit: fb580ce894e4a338bf48b0ee5492f99a1be1bab7
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Jul 26 13:21:19 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Jul 26 13:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb580ce8

dev-qt/qttools: drop 6.5.1

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 -
 dev-qt/qttools/qttools-6.5.1.ebuild | 66 -
 2 files changed, 67 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 69e781b90233..62db56b59314 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.5.1.tar.xz 8592428 BLAKE2B 
39a8eef639d4dea838b177285af175983e1e626cd82df8b2201b9380c4f62d5ec3560a7096b6f26a48886989be05bda453e487462d9e200577f15c9cb93eb26a
 SHA512 
fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011

diff --git a/dev-qt/qttools/qttools-6.5.1.ebuild 
b/dev-qt/qttools/qttools-6.5.1.ebuild
deleted file mode 100644
index e75eadff55af..
--- a/dev-qt/qttools/qttools-6.5.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 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
-   qattributionsscanner qdbus qdoc qdiag qplugininfo
-"
-
-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:= )
-   qdiag? ( =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 qattributionsscanner qtattributionsscanner)
-   $(qt_feature qdbus)
-   $(qt_feature qdoc clang)
-   $(qt_feature qdiag qtdiag)
-   $(qt_feature qplugininfo qtplugininfo)
-   -DQT_FEATURE_thread=ON
-   )
-
-   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 qdiag && qt6_symlink_binary_to_path qtdiag 6
-   use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-07-20 Thread Jimi Huotari
commit: 47604c3bbaffea045f294a1678922f023716ab17
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Jul 20 19:31:29 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Jul 20 19:40:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47604c3b

dev-qt/qttools: add 6.5.2

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 +
 dev-qt/qttools/qttools-6.5.2.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index e0c3a2e31376..69e781b90233 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.5.1.tar.xz 8592428 BLAKE2B 
39a8eef639d4dea838b177285af175983e1e626cd82df8b2201b9380c4f62d5ec3560a7096b6f26a48886989be05bda453e487462d9e200577f15c9cb93eb26a
 SHA512 
fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20
+DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 
37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397
 SHA512 
d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011

diff --git a/dev-qt/qttools/qttools-6.5.2.ebuild 
b/dev-qt/qttools/qttools-6.5.2.ebuild
new file mode 100644
index ..e75eadff55af
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2023 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
+   qattributionsscanner qdbus qdoc qdiag qplugininfo
+"
+
+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:= )
+   qdiag? ( =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 qattributionsscanner qtattributionsscanner)
+   $(qt_feature qdbus)
+   $(qt_feature qdoc clang)
+   $(qt_feature qdiag qtdiag)
+   $(qt_feature qplugininfo qtplugininfo)
+   -DQT_FEATURE_thread=ON
+   )
+
+   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 qdiag && qt6_symlink_binary_to_path qtdiag 6
+   use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-06-10 Thread Jimi Huotari
commit: 2d133d15139c96d0dd946ca5dda56e33c180b28e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Jun  7 14:32:27 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat Jun 10 13:33:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d133d15

dev-qt/qttools: drop 6.5.0

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 -
 dev-qt/qttools/qttools-6.5.0.ebuild | 66 -
 2 files changed, 67 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index eca401a10b3e..e0c3a2e31376 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.5.0.tar.xz 8588520 BLAKE2B 
5f0016c59d4281eaa03b605356c5c40ea4b0a72ed4a72c276c7b2d825a9cd5e364981d03ade406e353ff56094f7459b2a76829c320200b071c1ba29e67e796e7
 SHA512 
fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd
 DIST qttools-everywhere-src-6.5.1.tar.xz 8592428 BLAKE2B 
39a8eef639d4dea838b177285af175983e1e626cd82df8b2201b9380c4f62d5ec3560a7096b6f26a48886989be05bda453e487462d9e200577f15c9cb93eb26a
 SHA512 
fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20

diff --git a/dev-qt/qttools/qttools-6.5.0.ebuild 
b/dev-qt/qttools/qttools-6.5.0.ebuild
deleted file mode 100644
index 197390961888..
--- a/dev-qt/qttools/qttools-6.5.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 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}"
-
-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
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-05-06 Thread Jimi Huotari
commit: 6655f106a1e1d0e3a1bc9f7dcb40c1789d2d7dfc
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat May  6 11:23:35 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat May  6 11:25:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6655f106

dev-qt/qttools: drop 6.4.3

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 -
 dev-qt/qttools/qttools-6.4.3.ebuild | 66 -
 2 files changed, 67 deletions(-)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index d91a5e7c214b..3a94326eba08 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.4.3.tar.xz 8738280 BLAKE2B 
3da253fabc4025f36ef6a0a0a946b026288d5bc921794ecb9dd71a51113ca067ad7dc2b4f4ff85bb75f999d06639f8c9b85e3139d045ee46aaa05fc432285033
 SHA512 
24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382
 DIST qttools-everywhere-src-6.5.0.tar.xz 8588520 BLAKE2B 
5f0016c59d4281eaa03b605356c5c40ea4b0a72ed4a72c276c7b2d825a9cd5e364981d03ade406e353ff56094f7459b2a76829c320200b071c1ba29e67e796e7
 SHA512 
fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd

diff --git a/dev-qt/qttools/qttools-6.4.3.ebuild 
b/dev-qt/qttools/qttools-6.4.3.ebuild
deleted file mode 100644
index 197390961888..
--- a/dev-qt/qttools/qttools-6.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 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}"
-
-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
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-04-15 Thread Jimi Huotari
commit: 6c8e9cb9fa610ffe60cfb8e9f23a033e76678526
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat Apr 15 18:39:15 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat Apr 15 18:39:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8e9cb9

dev-qt/qttools: add 6.5.0

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 +
 dev-qt/qttools/qttools-6.5.0.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 11ae76385311..d91a5e7c214b 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.4.3.tar.xz 8738280 BLAKE2B 
3da253fabc4025f36ef6a0a0a946b026288d5bc921794ecb9dd71a51113ca067ad7dc2b4f4ff85bb75f999d06639f8c9b85e3139d045ee46aaa05fc432285033
 SHA512 
24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382
+DIST qttools-everywhere-src-6.5.0.tar.xz 8588520 BLAKE2B 
5f0016c59d4281eaa03b605356c5c40ea4b0a72ed4a72c276c7b2d825a9cd5e364981d03ade406e353ff56094f7459b2a76829c320200b071c1ba29e67e796e7
 SHA512 
fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd

diff --git a/dev-qt/qttools/qttools-6.5.0.ebuild 
b/dev-qt/qttools/qttools-6.5.0.ebuild
new file mode 100644
index ..197390961888
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2023 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}"
+
+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
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-03-26 Thread Jimi Huotari
commit: 88da50eb6a307e636925568fd3dc7abe81e6196f
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Mar 26 16:54:42 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sun Mar 26 16:59:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88da50eb

dev-qt/qttools: drop 6.4.2

Signed-off-by: Jimi Huotari  gentoo.org>

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

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 4580159b7314..11ae76385311 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B 
ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201
 SHA512 
303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c
 DIST qttools-everywhere-src-6.4.3.tar.xz 8738280 BLAKE2B 
3da253fabc4025f36ef6a0a0a946b026288d5bc921794ecb9dd71a51113ca067ad7dc2b4f4ff85bb75f999d06639f8c9b85e3139d045ee46aaa05fc432285033
 SHA512 
24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382

diff --git a/dev-qt/qttools/qttools-6.4.2.ebuild 
b/dev-qt/qttools/qttools-6.4.2.ebuild
deleted file mode 100644
index c81e52762d90..
--- a/dev-qt/qttools/qttools-6.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2023 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}"
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-03-19 Thread Jimi Huotari
commit: 1fdd392de323a402296270b42dcc8fcae6e9d4cf
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Mar 19 11:25:37 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sun Mar 19 13:06:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdd392d

dev-qt/qttools: add 6.4.3

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 +
 dev-qt/qttools/qttools-6.4.3.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index f2c0952ad660..4580159b7314 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B 
ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201
 SHA512 
303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c
+DIST qttools-everywhere-src-6.4.3.tar.xz 8738280 BLAKE2B 
3da253fabc4025f36ef6a0a0a946b026288d5bc921794ecb9dd71a51113ca067ad7dc2b4f4ff85bb75f999d06639f8c9b85e3139d045ee46aaa05fc432285033
 SHA512 
24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382

diff --git a/dev-qt/qttools/qttools-6.4.3.ebuild 
b/dev-qt/qttools/qttools-6.4.3.ebuild
new file mode 100644
index ..197390961888
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.4.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2023 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}"
+
+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
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/files/

2023-02-23 Thread Alfredo Tupone
commit: 9e730d89d81a691257e2071cb245c8a2854c46cb
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Feb 10 18:44:00 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Feb 23 21:01:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e730d89

dev-qt/qttools: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29536
Signed-off-by: Alfredo Tupone  gentoo.org>

 .../files/qttools-6.4.0-clang-15-build.patch   | 73 --
 1 file changed, 73 deletions(-)

diff --git a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch 
b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch
deleted file mode 100644
index eb2d8027cc09..
--- a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Gentoo Bug: https://bugs.gentoo.org/873640
-Qt Bug: https://bugreports.qt.io/browse/QTBUG-106224
-Patch: https://codereview.qt-project.org/c/qt/qttools/+/436135
-
-From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= 
-Date: Sat, 1 Oct 2022 07:19:52 +0200
-Subject: [PATCH] lupdate: Fix build with clang 15+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The signature of InclusionDirective changed for clang 15.
-
-Pick-to: 6.4
-Change-Id: Ic259b3508088671b40f6f615524137ce8837c487
-Reviewed-by: Jörg Bornemann 

- src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++--
- src/linguist/lupdate/lupdatepreprocessoraction.h   |  7 ++-
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp 
b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-index abfab34e5c..d963747d8e 100644
 a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-@@ -156,14 +156,23 @@ void 
LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
- // To list the included files
- void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
- const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool 
/*isAngled*/,
--clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
-+clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+const clang::Optional file,
-+#else
-+const clang::FileEntry *file,
-+#endif
- clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
- const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind 
/*fileType*/)
- {
- if (!file)
- return;
- 
--clang::StringRef fileNameRealPath = file->tryGetRealPathName();
-+clang::StringRef fileNameRealPath = file->
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+getFileEntry().
-+#endif
-+tryGetRealPathName();
- if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str()))
- return;
- 
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h 
b/src/linguist/lupdate/lupdatepreprocessoraction.h
-index b1ee468d4e..3e44cee839 100644
 a/src/linguist/lupdate/lupdatepreprocessoraction.h
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
-@@ -51,7 +51,12 @@ private:
- void SourceRangeSkipped(clang::SourceRange sourceRange, 
clang::SourceLocation endifLoc) override;
- void InclusionDirective(clang::SourceLocation /*hashLoc*/, const 
clang::Token &/*includeTok*/,
- clang::StringRef /*fileName*/, bool /*isAngled*/,
--clang::CharSourceRange /*filenameRange*/, const 
clang::FileEntry *file,
-+clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+const clang::Optional file,
-+#else
-+const clang::FileEntry *file,
-+#endif
- clang::StringRef /*searchPath*/, clang::StringRef 
/*relativePath*/,
- const clang::Module */*imported*/,
- clang::SrcMgr::CharacteristicKind /*fileType*/) 
override;
--- 
-2.16.3
-



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-02-09 Thread Andreas Sturmlechner
commit: bcc6a59acbb6b551a6a1a1b85718f85a51eebaf0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  8 22:19:12 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  9 09:48:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc6a59a

dev-qt/qttools: drop 6.4.0

Signed-off-by: Andreas Sturmlechner  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
index 629b50e7dd9c..f2c0952ad660 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 
0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5
 SHA512 
ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44
 DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B 
ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201
 SHA512 
303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c

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 6aa7cb05da97..
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-01-05 Thread Jimi Huotari
commit: 422ed1f12d957e0927067b1b737f74445122a3e3
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Jan  5 14:50:31 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Jan  5 22:38:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422ed1f1

dev-qt/qttools: add 6.4.2

Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qttools/Manifest |  1 +
 dev-qt/qttools/qttools-6.4.2.ebuild | 51 +
 2 files changed, 52 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index c155251c4005..629b50e7dd9c 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 
0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5
 SHA512 
ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44
+DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B 
ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201
 SHA512 
303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c

diff --git a/dev-qt/qttools/qttools-6.4.2.ebuild 
b/dev-qt/qttools/qttools-6.4.2.ebuild
new file mode 100644
index ..c81e52762d90
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.4.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021-2023 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}"
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2022-12-01 Thread Andreas Sturmlechner
commit: 65ae2b9ae1e2b975bfc5d0c28cec9796b80714b6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec  1 18:45:19 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec  1 19:19:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ae2b9a

dev-qt/qttools: drop 6.3.2

Signed-off-by: Andreas Sturmlechner  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
index 4c16602d8ca0..c155251c4005 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.3.2.tar.xz 8629400 BLAKE2B 
594f7f31e0f10006d1c58d26c5ae13b7f9c8b5770adaddee90a176676dff2029215501d01d599da0656876cd6f8b97275754a9b8c37735412154ca3f458656b3
 SHA512 
ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1
 DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 
0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5
 SHA512 
ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44

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 23e1c0874fce..
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/files/, dev-qt/qtserialport/, dev-qt/qtmultimedia/, ...

2022-11-01 Thread Sam James
commit: c2b15ca2f28c0decd82dff7167b73a455ac1c7b1
Author: Jimi Huotari  gentoo  org>
AuthorDate: Fri Oct 14 15:30:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 05:09:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b15ca2

dev-qt/*: add version 6.4.0

Bug: https://bugs.gentoo.org/838970
Bug: https://bugs.gentoo.org/863224
Bug: https://bugs.gentoo.org/875956
Closes: https://bugs.gentoo.org/862525
Closes: https://bugs.gentoo.org/863395
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27812
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt5compat/Manifest  |   1 +
 dev-qt/qt5compat/qt5compat-6.4.0.ebuild|  18 ++
 dev-qt/qtbase/Manifest |   1 +
 dev-qt/qtbase/qtbase-6.4.0.ebuild  | 185 
 dev-qt/qtcharts/Manifest   |   1 +
 dev-qt/qtcharts/qtcharts-6.4.0.ebuild  |  18 ++
 dev-qt/qtdeclarative/Manifest  |   1 +
 dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild|  30 +++
 dev-qt/qtimageformats/Manifest |   1 +
 dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild  |  35 +++
 dev-qt/qtmultimedia/Manifest   |   1 +
 dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild  |  42 
 dev-qt/qtnetworkauth/Manifest  |   1 +
 dev-qt/qtnetworkauth/qtnetworkauth-6.4.0.ebuild|  17 ++
 dev-qt/qtpositioning/Manifest  |   1 +
 dev-qt/qtpositioning/qtpositioning-6.4.0.ebuild|  19 ++
 dev-qt/qtquick3d/Manifest  |   1 +
 dev-qt/qtquick3d/qtquick3d-6.4.0.ebuild|  32 +++
 dev-qt/qtquicktimeline/Manifest|   1 +
 .../qtquicktimeline/qtquicktimeline-6.4.0.ebuild   |  18 ++
 dev-qt/qtserialport/Manifest   |   1 +
 dev-qt/qtserialport/qtserialport-6.4.0.ebuild  |  18 ++
 dev-qt/qtshadertools/Manifest  |   1 +
 dev-qt/qtshadertools/qtshadertools-6.4.0.ebuild|  17 ++
 dev-qt/qtsvg/Manifest  |   1 +
 dev-qt/qtsvg/qtsvg-6.4.0.ebuild|  18 ++
 dev-qt/qttools/Manifest|   1 +
 .../files/qttools-6.4.0-clang-15-build.patch   |  73 ++
 dev-qt/qttools/qttools-6.4.0.ebuild|  55 +
 dev-qt/qtwayland/Manifest  |   1 +
 dev-qt/qtwayland/qtwayland-6.4.0.ebuild|  22 ++
 dev-qt/qtwebchannel/Manifest   |   1 +
 dev-qt/qtwebchannel/qtwebchannel-6.4.0.ebuild  |  19 ++
 dev-qt/qtwebengine/Manifest|   1 +
 .../qtwebengine-6.4.0-no-websocket-intercept.patch |  38 
 dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild| 245 +
 dev-qt/qtwebsockets/Manifest   |   1 +
 dev-qt/qtwebsockets/qtwebsockets-6.4.0.ebuild  |  18 ++
 38 files changed, 955 insertions(+)

diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 1b89d952013d..5c7caa627000 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1 +1,2 @@
 DIST qt5compat-everywhere-src-6.3.2.tar.xz 8194996 BLAKE2B 
cd874a41dc667f8d8e970c962c8475d41139081c8587249204779800bb7e50cf6f33e024cc43a9ab67ff5ae37536ca01e1365c2bca449ae53586b8d410d9b8cc
 SHA512 
12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e
+DIST qt5compat-everywhere-src-6.4.0.tar.xz 14641720 BLAKE2B 
abed031d736e2f05856a02e96251bf77c12823866c722247360a19d592a71e52a2fb5bac121baa91dd264806fff6b2230d41ab92346ee92c4fcef7607838d4a0
 SHA512 
d14ebf4ed6061b7154fdd67ac71849bcfb109c9911dcc9279c01bf07b6f58cf26a882f16be6228040e6465345259a16be2296481c2129c88710fa7b4da747ba5

diff --git a/dev-qt/qt5compat/qt5compat-6.4.0.ebuild 
b/dev-qt/qt5compat/qt5compat-6.4.0.ebuild
new file mode 100644
index ..2bf0684e946d
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64"
+fi
+
+DEPEND="
+   =dev-qt/qtbase-${PV}*[gui,network]
+   =dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 469b7132fb46..2102f829b611 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
 DIST qtbase-everywhere-src-6.3.2.tar.xz 47507396 BLAKE2B 
9f5a1af7abb914af58c32bfdd2f54fdd2d496972606bfa68425e5997be74249d0314a4978fc8359c5a6ccad3f6ef6920bf3e7c9450b256f39d830abf7e778051
 SHA512 
e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
+DIST 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2022-09-24 Thread Andreas Sturmlechner
commit: 574501ebf1355b6b6fd61fe47478145c58268c06
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 24 14:07:23 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 24 14:32:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574501eb

dev-qt/qttools: drop 6.3.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 584ce00c836c..229a67e4b708 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-6.3.1.tar.xz 8628880 BLAKE2B 
e8a142ad601490a4d3d2398d074b87a8a574f97676d218a20e9a5499b7a46de47e92098dd72f304f3464207bc8341fbc51508c52624af42476555b3198e2f334
 SHA512 
6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
 DIST qttools-everywhere-src-6.3.2.tar.xz 8629400 BLAKE2B 
594f7f31e0f10006d1c58d26c5ae13b7f9c8b5770adaddee90a176676dff2029215501d01d599da0656876cd6f8b97275754a9b8c37735412154ca3f458656b3
 SHA512 
ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1

diff --git a/dev-qt/qttools/qttools-6.3.1.ebuild 
b/dev-qt/qttools/qttools-6.3.1.ebuild
deleted file mode 100644
index 23e1c0874fce..
--- a/dev-qt/qttools/qttools-6.3.1.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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2022-09-24 Thread Andreas Sturmlechner
commit: bde2472ff63e599a0062e88779b8758fc34ed053
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 24 14:05:48 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 24 14:32:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde2472f

dev-qt/qttools: add 6.3.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 4826c8801bca..584ce00c836c 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1 +1,2 @@
 DIST qttools-everywhere-src-6.3.1.tar.xz 8628880 BLAKE2B 
e8a142ad601490a4d3d2398d074b87a8a574f97676d218a20e9a5499b7a46de47e92098dd72f304f3464207bc8341fbc51508c52624af42476555b3198e2f334
 SHA512 
6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
+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
new file mode 100644
index ..23e1c0874fce
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.3.2.ebuild
@@ -0,0 +1,52 @@
+# 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2022-08-02 Thread Sam James
commit: c8771b0ff839fed4e916db937362389d212b4b6a
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  2 22:00:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  2 22:00:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8771b0f

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

Signed-off-by: Sam James  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 5f0baf52f205..b86ca58bee58 100644
--- a/dev-qt/qttools/metadata.xml
+++ b/dev-qt/qttools/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 

q...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2022-08-02 Thread Sam James
commit: 508e45c4f0c876b219c139c67a1f9d632bd37f06
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed May 25 22:51:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  2 21:49:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508e45c4

dev-qt/qttools: new package

Version 6.3.1 of qttools in non-split form.

Bug: https://bugs.gentoo.org/838970
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qttools/Manifest |  1 +
 dev-qt/qttools/metadata.xml | 29 +
 dev-qt/qttools/qttools-6.3.1.ebuild | 52 +
 3 files changed, 82 insertions(+)

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
new file mode 100644
index ..4826c8801bca
--- /dev/null
+++ b/dev-qt/qttools/Manifest
@@ -0,0 +1 @@
+DIST qttools-everywhere-src-6.3.1.tar.xz 8628880 BLAKE2B 
e8a142ad601490a4d3d2398d074b87a8a574f97676d218a20e9a5499b7a46de47e92098dd72f304f3464207bc8341fbc51508c52624af42476555b3198e2f334
 SHA512 
6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883

diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml
new file mode 100644
index ..5f0baf52f205
--- /dev/null
+++ b/dev-qt/qttools/metadata.xml
@@ -0,0 +1,29 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   q...@gentoo.org
+   Gentoo Qt Project
+   
+   
+   Build Qt Assistant
+   Build Qt Designer
+   Build Qt Distance Field 
Generator
+   Build Qt Linguist
+   Build Qt Pixeltool
+   Build the Qt D-Bus Interface and D-Bus 
Viewer
+   Build Qt Documentation Generator
+   Build Qt Source Code 
Attribution Scanner
+   Build Qt Diag
+   Build Qt Plugin Info
+   
+   
+   https://bugreports.qt.io/
+   https://doc.qt.io/
+   
+   
+   
+   Must only be used by packages that are known to use 
private parts of the Qt API.
+   
+   
+

diff --git a/dev-qt/qttools/qttools-6.3.1.ebuild 
b/dev-qt/qttools/qttools-6.3.1.ebuild
new file mode 100644
index ..23e1c0874fce
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.3.1.ebuild
@@ -0,0 +1,52 @@
+# 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
+}