From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7D651581B9 for ; Sun, 28 Sep 2025 06:53:40 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A26AE341006 for ; Sun, 28 Sep 2025 06:53:40 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A78F0110581; Sun, 28 Sep 2025 06:53:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 9D7B2110581 for ; Sun, 28 Sep 2025 06:53:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57DE7340DD5 for ; Sun, 28 Sep 2025 06:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C4913A65 for ; Sun, 28 Sep 2025 06:53:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1759042238.43e2c88bf587ca92a55df518c4e3c96ffec0f636.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qttools/Manifest dev-qt/qttools/qttools-6.9.1.ebuild X-VCS-Directories: dev-qt/qttools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 43e2c88bf587ca92a55df518c4e3c96ffec0f636 X-VCS-Branch: master Date: Sun, 28 Sep 2025 06:53:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ae1145d-29cf-4bc6-99a2-344b985f2612 X-Archives-Hash: b195b2495f1fb8b5c0323fe6d4b3ede6 commit: 43e2c88bf587ca92a55df518c4e3c96ffec0f636 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Sep 28 04:12:00 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Sep 28 06:50:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e2c88b dev-qt/qttools: drop 6.9.1 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/Manifest | 1 - dev-qt/qttools/qttools-6.9.1.ebuild | 168 ------------------------------------ 2 files changed, 169 deletions(-) diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 7cd89a7aba11..d2a807d96a30 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,3 +1,2 @@ DIST qttools-everywhere-src-6.10.0-rc.tar.xz 10036684 BLAKE2B ef4f6b9309499a4fa88bd2e45146dc257f23dadc8a7eb302a8393918ba4f98b1ce3c29c573b178ebccfc5560f36a9238ec0b5ca02703725007cf4e816aab6509 SHA512 93ecd157158b55c12d2ee129683ea3de75a35e498de44fce0b1aef6c45df33f8b82f8429b961a75f2363eb727313aa13380dc7d1e76195595a0dc0170399a66a -DIST qttools-everywhere-src-6.9.1.tar.xz 10339096 BLAKE2B 110d64c16d67bef1d8129ed014aa35af3d0b1e5d5042c5ba417dd38e6986f9068d18e83f60ff6c46132d2f30321e87268f6de83670769a245a890b48f057acdf SHA512 84891798a1227d6ec5d353fe510e02cea1f26d1639cfc87e95eefe63ca9522f36b252666b9954ec0a3a83b2561f53538d9aad51fdc02149a56f1177466be6c22 DIST qttools-everywhere-src-6.9.2.tar.xz 10330412 BLAKE2B 96f585f87dd43d5bbe9f7080b0f49ec8474f7ee4830858f2d5a9fe2dafeed548cd96cec5cac5faef82a990a1324dbb80b41c4e63abc252c5788b9b25660ae79d SHA512 95f2e666accbb474d2a7bb0ac88b4fb006e14a419301272fdb1f168b79e9437cad224b678298a355faba243853e9314c5f2b5e5192e56f4772a373e41d74dce0 diff --git a/dev-qt/qttools/qttools-6.9.1.ebuild b/dev-qt/qttools/qttools-6.9.1.ebuild deleted file mode 100644 index 08a620994596..000000000000 --- a/dev-qt/qttools/qttools-6.9.1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {17..20} ) # 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-r2 optfeature qt6-build - -DESCRIPTION="Qt Tools Collection" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv 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[concurrent,network,sql,sqlite] ) - clang? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/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 ) - ) -" - -src_prepare() { - qt6-build_src_prepare - - # qttools is picky about clang versions and ignores LLVM_SLOT - sed -e '/find_package/s/${\(LLVM_\)*VERSION}//' \ - -i cmake/FindWrapLibClang.cmake || die -} - -src_configure() { - use clang && llvm_chost_setup - - 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 - - # *could* consider a USE=gui to guard GUI applications and their .desktop - # files when only want the libraries (Help/UiTools), but cmake logic makes - # it difficult to get only these and we'd be just rm'ing small'ish files - 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 -}