gentoo auto-resync : 03:12:2024 - 02:07:18

2 files changed, 161 insertions, 0 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 9dcc64b608d9..726053757083 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,9 +1,11 @@
 DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd
 DIST qttools-everywhere-src-6.7.3.tar.xz 9022820 BLAKE2B e1eafdbc9a08b031a51480733be38e2b217e66b6f66a49e99e603fa0b6ed780164a403c984069cc33819203edd7984b6a1f8dc5af4ebcad94ecc6730f3f1d604 SHA512 c15a76a84e8cea53e8c68b00325acf2cd3fe8097c578f3e96fbb68958453116f02fed25d2811d4485b82f196b988870f0078aea0450c4526523fb8ffacbfae57
 DIST qttools-everywhere-src-6.8.0.tar.xz 9059032 BLAKE2B 83ec98a8cbaf049649b8df0ac6c478e5b1867b0034d8e8f57120dbc9b4c17b3b708bb14c9a7030bcca9330bc4eb1c0e54f44a249c5303f84129b14f42376d19d SHA512 e477c980446fe421484481537fb9997eca6595dae19e9bc7809d24e7685efb802fb704c97bacc77214070e6b7a0f7346f1537cc143e3fccb309bf14e9c8e8d75
+DIST qttools-everywhere-src-6.8.1.tar.xz 10293192 BLAKE2B f670dcbf624dd32a59ad4e29020a46b745f6fc3cfc07b971c7704e7e63719fef3b226abdc9d3b8f9ff054659fde03633c2aa05ae487f12ee4a3ef44db356a252 SHA512 1f5eb44e86d400858abe21efcadb27537ae213127078d95ee56792b57923573e55fd850042e63ca547cd27ba199196fe9956646dcb285c6f6976a22a7832db52
 EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4a77d671a5311fcd7e6170bc29764560993be958cc8ea58d6c31d8132372a5f65197a69acd3eee45d211cbbf95ee653849faa7d98a302db07f60e3b79b3e4912 SHA512 69930be9d05a6fbb10c616b8ec8b664d40428abbf516777ac5fcf85adc4a2ed39a82bcbfbb988aef8568ac0a3adcb4939fb89e531e90bbda97c751c6ff0e3e49
 EBUILD qttools-6.7.3.ebuild 4665 BLAKE2B e85c3ddd06e3d73a2420dd29bac6eaebb0892583af4055f895d85bae07e654618c7ea508c9a4cb4dd4bb5c27d3d4231fa2087b21fe88ef3f2ad6b3f25fe229c5 SHA512 4e072a9bba94ddcadb4772d10faffd3bd453c1c3041f4a73a950b3384df408c25c8851e1fcccdd4478d2e1921262cfc0f10175ef14db941469d825bab50cac22
 EBUILD qttools-6.8.0.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
+EBUILD qttools-6.8.1.ebuild 4918 BLAKE2B f9aaf4659f8c5d8471305308c7d2928bd3c560f470fcde0442d8c25c2bab758c5e8e7976fe006082326b26c9be7a2cc0c5296db166b1fa8604e314376114be8d SHA512 182e3d7db9c8549c400d63d086469c9109a30c561022e7f84ed36a1b8b186450e5ec0a233be5fb3c7a7d4fee4900a8ea4c1b3896cc3e520c00b2d82b0ca83804
 EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B f9aaf4659f8c5d8471305308c7d2928bd3c560f470fcde0442d8c25c2bab758c5e8e7976fe006082326b26c9be7a2cc0c5296db166b1fa8604e314376114be8d SHA512 182e3d7db9c8549c400d63d086469c9109a30c561022e7f84ed36a1b8b186450e5ec0a233be5fb3c7a7d4fee4900a8ea4c1b3896cc3e520c00b2d82b0ca83804
 EBUILD qttools-6.9999.ebuild 4918 BLAKE2B f9aaf4659f8c5d8471305308c7d2928bd3c560f470fcde0442d8c25c2bab758c5e8e7976fe006082326b26c9be7a2cc0c5296db166b1fa8604e314376114be8d SHA512 182e3d7db9c8549c400d63d086469c9109a30c561022e7f84ed36a1b8b186450e5ec0a233be5fb3c7a7d4fee4900a8ea4c1b3896cc3e520c00b2d82b0ca83804
 MISC metadata.xml 1495 BLAKE2B 05681d2d714d1d6e2939d105c48c3e16a1a99b4196b04fe0f1ed62cd628f0b3d743d75229aa123c887dfd2abea1e67b43d7224a1603d889f2f75d964f51206b8 SHA512 6c692eed887713ef7a3d33b2644ecfcf0ec2f346e5e15857996b8a6916a137d22cb2255cc2a44de06a4fb1e0818395842c52925b232ac49d7280210d2441f89a
diff --git a/dev-qt/qttools/qttools-6.8.1.ebuild b/dev-qt/qttools/qttools-6.8.1.ebuild
new file mode 100644
index 000000000000..68f3a306f5bb
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.8.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..19} ) # 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 qmlls 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 )
+	qmlls? ( assistant qml )
+"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? (
+		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
+		zstd? ( app-arch/zstd:= )
+	)
+	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,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)
+
+		# USE=qmlls' help plugin may be temporary, upstream has plans to split
+		# QtHelp into another package so that qtdeclarative can depend on it
+		# without a circular dependency with qttools
+		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
+	)
+
+	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
+}