gentoo auto-resync : 14:02:2024 - 17:36:28

2 files changed, 153 insertions, 0 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index cca0927f9e93..04d075286cd7 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD qttools-6.6.1.ebuild 4499 BLAKE2B f3765a82003b42f1b097b25233d63ed6d861943e55071bca07f5bac1e85cb2734e215b0c712677efcb82e0382c49cc2a399ad611796551101f757f94364603dd SHA512 fe9b7fcbe1c03f1c5f1336fe892123f02efde25227d4c300e41167675670a9edbe98b81c69547b6c64e86584d5a1bbd20a8482194b50520e73348f3d6c697074
+EBUILD qttools-6.6.2.ebuild 4541 BLAKE2B 23f422d173c81c34b000b0864f940aed0042b135ef763795c385db49d3d1104382d73542c57fe184e53da0d3c32de437e3859af66838989a659c30ac8d3f8458 SHA512 bcb65650fa0bbd90e79814ac3d77d5a7420c799603600b99a394be6b41703eed3af77227d3336613772db2e4d426ebe75484dcd795f7bdf70e362562b8b7e730
 EBUILD qttools-6.6.9999.ebuild 4541 BLAKE2B 23f422d173c81c34b000b0864f940aed0042b135ef763795c385db49d3d1104382d73542c57fe184e53da0d3c32de437e3859af66838989a659c30ac8d3f8458 SHA512 bcb65650fa0bbd90e79814ac3d77d5a7420c799603600b99a394be6b41703eed3af77227d3336613772db2e4d426ebe75484dcd795f7bdf70e362562b8b7e730
 EBUILD qttools-6.7.9999.ebuild 4571 BLAKE2B f7e30a9c4acff12ed5686b5f0e092ace4625fde91714c85ff747d6aea8ee1bb7a8627c7b69d2a53a9ee820e4a4b3dba5adcc0b6f0f1d2458f2958740e2f9d15a SHA512 fd55d2c5da4f95292708a5da7ebc7acab433e1f74ef71b4cc6c3be93cb2591cacb24d4b048db91e6e96e16fbc229088b22bf0c59cfd646eaf986b80062b18c2b
 EBUILD qttools-6.9999.ebuild 4571 BLAKE2B f7e30a9c4acff12ed5686b5f0e092ace4625fde91714c85ff747d6aea8ee1bb7a8627c7b69d2a53a9ee820e4a4b3dba5adcc0b6f0f1d2458f2958740e2f9d15a SHA512 fd55d2c5da4f95292708a5da7ebc7acab433e1f74ef71b4cc6c3be93cb2591cacb24d4b048db91e6e96e16fbc229088b22bf0c59cfd646eaf986b80062b18c2b
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 000000000000..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 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" \
+			'dev-qt/qt-docs:6[qch]' #602296
+}