gentoo auto-resync : 22:03:2024 - 13:00:51

3 files changed, 157 insertions, 2 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 3ac6d430fbd1..5844b4f4c1d7 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,8 +1,10 @@
 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 710ecb68643730d87b7810e6cbadbac9750dc05886ceb712803c94b5736e96c716e6547159502222f3c23240fd297182dca7e7e97037e373894fb7d4bb32c46a SHA512 3e74ac9a22ecf3474f9b47f3c6dc7ad70ceebf6718f2c3bb8d92276286d0283a961f4cdaee553474de429081c50e919e462aefc7abb109d5fd77a977f7d5301e
-EBUILD qttools-6.6.2.ebuild 4543 BLAKE2B f00361903f669e8fb37e8cb37d284b49b81b292ed8f3bb43e832904580950fc9504dd5e783e3e13c12132496e37aebc3c4144c32e4ec5dcb27a34f04a32ac1d2 SHA512 c795a6c762aa0111d63f008a99fd05f46ca7d3cb27e43310aa306c615f927b172c6aca651df31aad06056be44f5d9c3b445c5bb48db8057ce07d32672b23bb0d
+DIST qttools-everywhere-src-6.7.0-rc2.tar.xz 9013380 BLAKE2B f6b9b83af390f3c2f851dc8e99ae6a045752a77f9878a1c096c35a034515680d27e65ca3ccf6d558de74804eb82f1a1c2e92377db1de014581685f44d05cb5ce SHA512 23b8a88397f89d1aaf80495d15bc34d3ebc54ef14097065bb2c013d4c408407a24fcc901b0c2691c2bec758309bea8f3c53be551960e58255b2e3858b817e3af
+EBUILD qttools-6.6.2.ebuild 4542 BLAKE2B 97b1c6bc9be1c42bbea95bbfc1f16793050aa919103fff63a7be786301bd396f16a00a76817feedeace43f766a3d9bba4ad9d9d1c99e4655c62483b392725843 SHA512 a6380a6dfe0d156e03ad68caa350aad1e7d72c1d9cd7f808ae1d27538d79e0d4ad8fe06f6a03532f848bd0bb3093d76d7a1d9323658ba516fce686b8d9d2c706
 EBUILD qttools-6.6.9999.ebuild 4615 BLAKE2B 511be45588d3a45f20bcebcc62de6aafbd56093cbb76632bab59b5064203aabb1479853fe3a422601fc1343f8a5602445c6c727cb17d35e5a4439b887c3acf75 SHA512 4321a3fbac878cdb22f30385d83e338207bf4b2aea5dabbe9f170a245750dea71cad28ad6e56f9d71ce732a93abb569c9a945c1842df27c453ae6a11a30e0fcd
 EBUILD qttools-6.7.0_rc.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
+EBUILD qttools-6.7.0_rc2.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
 EBUILD qttools-6.7.9999.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
 EBUILD qttools-6.9999.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
 MISC metadata.xml 1415 BLAKE2B 082d3fb170635bf0434df13b560689eeafd163b618f26e000ec23b8007329e83fe3537be983b44a4e055271fa20a37fed570585c9af950b3488f2cd6806f581a SHA512 c0469f0638488b75ee9a68fb213df728eafa7d13facae1929ca4d847f3b2fbc682522c315c0ae42688cbd7a00a134168009c6fb5bfa66ad318e829704aad6761
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="
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 000000000000..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)
+
+		$(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 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
+}