gentoo auto-resync : 13:09:2023 - 22:45:20

3 files changed, 98 insertions, 6 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index fa6ac4108641..c3189bdae52e 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,5 +1,6 @@
 DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397 SHA512 d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
 EBUILD qttools-6.5.2-r1.ebuild 2301 BLAKE2B 3f48fd4c9e7347d81b5111407e7658892041a6223a30671deb015ba69d8c3063ad91d7d205d8e6cade0b5b45069ce9232a394f0434bcfe331013ef83f27a6503 SHA512 b91f1afccf27246c02eb73cf708f415445fd901430d333334e01aeb0fd37c63d29df6557d9c5e31ba7482cb54676d24fed9a692a0dfcd466e44dc678e327fe95
 EBUILD qttools-6.5.9999.ebuild 2284 BLAKE2B b33b383177131409da792ab93f263764862203e579b6208b97b3c0e58907ecf2a369e48355f524bf3640fc1db09a137ddac3cbb62379b29cf72411fa050e9783 SHA512 fda4172784d089eb1bfaeb9fcb2e25e1bb2617c9b430630fb71d6414e41158c6a575f2426a8b2e294cb5f141e2b337ab9e80c9859da1abfeeca6974642b9c7bc
-EBUILD qttools-6.9999.ebuild 2284 BLAKE2B b33b383177131409da792ab93f263764862203e579b6208b97b3c0e58907ecf2a369e48355f524bf3640fc1db09a137ddac3cbb62379b29cf72411fa050e9783 SHA512 fda4172784d089eb1bfaeb9fcb2e25e1bb2617c9b430630fb71d6414e41158c6a575f2426a8b2e294cb5f141e2b337ab9e80c9859da1abfeeca6974642b9c7bc
+EBUILD qttools-6.6.9999.ebuild 2305 BLAKE2B 08686030aee50f3b01069b139fa9ebe4c99c21eb8ddeb76576ad15c651e9ab765a327449aa8bb69e69efc5dc423fcb5a4355d9aa0870279f9af07d22addf54b7 SHA512 cec8a1e9be36ae6a31c93cdeb751be9490696fdb1f0a1f25fa7e73fbeaa70940867109ac48636dbc02494eefac1ada0c8c2da6fee18594d42042684917747a3d
+EBUILD qttools-6.9999.ebuild 2305 BLAKE2B 08686030aee50f3b01069b139fa9ebe4c99c21eb8ddeb76576ad15c651e9ab765a327449aa8bb69e69efc5dc423fcb5a4355d9aa0870279f9af07d22addf54b7 SHA512 cec8a1e9be36ae6a31c93cdeb751be9490696fdb1f0a1f25fa7e73fbeaa70940867109ac48636dbc02494eefac1ada0c8c2da6fee18594d42042684917747a3d
 MISC metadata.xml 1393 BLAKE2B ffe27b97fb8e5d072b2228ded8dfb59c4f0d5837cb1656ebdf4893818d3dbb3b7e359e273d8fdc356d21d3af5f5a841254b7ab26e348584e896b94151181a6c3 SHA512 3dad0d030fb1d92fb5719a1405199c4e9a2b445a5f6d3d3ac609c74a0cc6c6b5bcd414c556db8cb09e54549158b23b57175a04fdf21ae29f331827872db69a04
diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild
new file mode 100644
index 000000000000..0e1eba0054cc
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.6.9999.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"
+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? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= )
+	designer? (
+		app-arch/zstd:=
+		~dev-qt/qtbase-${PV}:6[xml,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_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(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
+}
+
+pkg_postinst() {
+	use assistant &&
+		optfeature "Qt documentation viewable in assistant" \
+			'dev-qt/qt-docs:6[qch]' #602296
+}
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 295a69f8fd39..0e1eba0054cc 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.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)
@@ -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
@@ -36,7 +36,10 @@ RDEPEND="
 	~dev-qt/qtbase-${PV}:6[network,widgets?]
 	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
 	clang? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= )
-	designer? ( ~dev-qt/qtbase-${PV}:6[xml] )
+	designer? (
+		app-arch/zstd:=
+		~dev-qt/qtbase-${PV}:6[xml,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=] )
@@ -58,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)