gentoo auto-resync : 15:11:2023 - 22:37:24

3 files changed, 2 insertions, 143 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 1ea41088ff52..c95c1936eef4 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,8 +1,6 @@
-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
-EBUILD qttools-6.5.2-r2.ebuild 4263 BLAKE2B 434478b95cc1266a92aaab0cee5511a1973e023c11cd1addc4b2e91dacff21469398ec743c9828f433ab98fcf59f0e2964f37af62d0fcfc27a8433edea52bb19 SHA512 caa90508a3369d688b8ecd04a267beb7739bf0c7e971db7834d808db54470ac16324a10ee7afdc2250e7b12bb1afe9a6bb2dc88d5c0ed492a75874a840dcaf7b
-EBUILD qttools-6.5.3.ebuild 4334 BLAKE2B 5f28803e18a913a6e5d369b5bfd41f45193c54292e407cc7ff35c619552250fa27bf33db5cc27b06fca61cd4e35688eb065a9bc64e95ce0b47723fa01a027741 SHA512 c6ad6f87a8d41d6d981d267ed8d323cef9f5ed1cb298595e705c4d42422413fdee8e54f7e723866c2af3e9f29d7d933fdea97b1e3397753cec88808e70b9a208
+EBUILD qttools-6.5.3.ebuild 4333 BLAKE2B 43559dce18d9652d84b6c9a759ea998cfbfa37b98227b943121c2113a9b470f9a40fc12e4a23adb110bad04ba9c07d489a854f21b6ac9cec9c680cb7da6b07e9 SHA512 c5268a14aee074dca0a667ecd933ac8380a1585522c16a2cb0e087b243e111036da1503164050c8739af7b7da90423514ce2a20f1544db24a8df49757e488567
 EBUILD qttools-6.6.0.ebuild 4365 BLAKE2B d9003eff4983c760d0518edfa1d80f47905858df3a912b0777964f5fffb229c649727dacdedd24bb7139c264f8465fef3c4ba9ca989231a66b6281f6abb3c22b SHA512 2098f3291bdadfb24bb4008355541bca476c9843a2e388c5585fae2540f4ed36abb200d2f8f16cef2ad53c844b723d51afff4a49bf55c285daf00a60c1966626
 EBUILD qttools-6.6.9999.ebuild 4365 BLAKE2B d9003eff4983c760d0518edfa1d80f47905858df3a912b0777964f5fffb229c649727dacdedd24bb7139c264f8465fef3c4ba9ca989231a66b6281f6abb3c22b SHA512 2098f3291bdadfb24bb4008355541bca476c9843a2e388c5585fae2540f4ed36abb200d2f8f16cef2ad53c844b723d51afff4a49bf55c285daf00a60c1966626
 EBUILD qttools-6.9999.ebuild 4365 BLAKE2B d9003eff4983c760d0518edfa1d80f47905858df3a912b0777964f5fffb229c649727dacdedd24bb7139c264f8465fef3c4ba9ca989231a66b6281f6abb3c22b SHA512 2098f3291bdadfb24bb4008355541bca476c9843a2e388c5585fae2540f4ed36abb200d2f8f16cef2ad53c844b723d51afff4a49bf55c285daf00a60c1966626
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..000000000000
--- 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? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= )
-	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[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 clangcpp)
-		$(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)
-
-		# 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
-}
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="