From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/
Date: Mon, 06 Jan 2025 22:51:02 +0000 (UTC) [thread overview]
Message-ID: <1736203728.bc54c8b143b2d8986e375d782273465c20b589f9.ionen@gentoo> (raw)
commit: bc54c8b143b2d8986e375d782273465c20b589f9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 22:54:10 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 22:48:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc54c8b1
dev-qt/qttools: drop 6.7.2, 6.7.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qttools/Manifest | 2 -
dev-qt/qttools/qttools-6.7.2.ebuild | 154 ------------------------------------
dev-qt/qttools/qttools-6.7.3.ebuild | 154 ------------------------------------
3 files changed, 310 deletions(-)
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 3d6728aaa925..528299bd9ce1 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1 @@
-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.1.tar.xz 10293192 BLAKE2B f670dcbf624dd32a59ad4e29020a46b745f6fc3cfc07b971c7704e7e63719fef3b226abdc9d3b8f9ff054659fde03633c2aa05ae487f12ee4a3ef44db356a252 SHA512 1f5eb44e86d400858abe21efcadb27537ae213127078d95ee56792b57923573e55fd850042e63ca547cd27ba199196fe9956646dcb285c6f6976a22a7832db52
diff --git a/dev-qt/qttools/qttools-6.7.2.ebuild b/dev-qt/qttools/qttools-6.7.2.ebuild
deleted file mode 100644
index 7c2fc972d872..000000000000
--- a/dev-qt/qttools/qttools-6.7.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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
-
-# 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 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 )
-"
-
-RDEPEND="
- ~dev-qt/qtbase-${PV}:6[network,widgets?]
- assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
- clang? (
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/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
-}
diff --git a/dev-qt/qttools/qttools-6.7.3.ebuild b/dev-qt/qttools/qttools-6.7.3.ebuild
deleted file mode 100644
index 35144aef699c..000000000000
--- a/dev-qt/qttools/qttools-6.7.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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
-
-# 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 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 )
-"
-
-RDEPEND="
- ~dev-qt/qtbase-${PV}:6[widgets?]
- assistant? ( ~dev-qt/qtbase-${PV}:6[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?] )
- 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)
-
- $(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
-}
next reply other threads:[~2025-01-06 22:51 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 22:51 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-15 16:28 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ Ionen Wolkens
2025-10-10 9:34 Arthur Zamarin
2025-10-07 6:17 Ionen Wolkens
2025-10-01 6:49 Ionen Wolkens
2025-09-30 11:56 Ionen Wolkens
2025-09-28 6:53 Ionen Wolkens
2025-09-23 5:07 Ionen Wolkens
2025-09-19 6:11 Arthur Zamarin
2025-09-18 17:38 Arthur Zamarin
2025-09-18 10:44 Arthur Zamarin
2025-09-07 17:10 Ionen Wolkens
2025-09-07 17:10 Ionen Wolkens
2025-08-26 10:59 Ionen Wolkens
2025-08-12 7:59 Ionen Wolkens
2025-07-10 14:33 Ionen Wolkens
2025-06-28 2:47 Sam James
2025-06-09 8:07 Ionen Wolkens
2025-06-09 7:03 Sam James
2025-06-07 16:16 Ionen Wolkens
2025-06-07 12:02 Ionen Wolkens
2025-06-03 10:37 Ionen Wolkens
2025-05-03 15:08 Arthur Zamarin
2025-04-16 11:18 Arthur Zamarin
2025-04-15 10:22 Sam James
2025-04-03 9:10 Ionen Wolkens
2025-04-02 5:08 Ionen Wolkens
2025-03-26 12:29 Ionen Wolkens
2025-03-20 22:56 Ionen Wolkens
2025-03-14 8:18 Ionen Wolkens
2025-03-13 11:57 Ionen Wolkens
2025-03-13 11:54 Ionen Wolkens
2025-03-06 9:20 Ionen Wolkens
2025-02-22 14:46 Arthur Zamarin
2025-02-21 15:34 Arthur Zamarin
2025-01-31 8:20 Ionen Wolkens
2025-01-06 7:05 Ionen Wolkens
2024-12-27 21:01 Ionen Wolkens
2024-12-27 12:02 Sam James
2024-12-27 1:54 Sam James
2024-12-25 22:40 Sam James
2024-12-18 4:37 Ionen Wolkens
2024-12-15 20:18 Ionen Wolkens
2024-12-03 18:16 Ionen Wolkens
2024-12-02 7:23 Ionen Wolkens
2024-11-13 10:04 Ionen Wolkens
2024-11-02 14:10 Arthur Zamarin
2024-11-01 6:35 Arthur Zamarin
2024-10-09 6:22 Ionen Wolkens
2024-10-08 5:03 Ionen Wolkens
2024-09-27 7:26 Ionen Wolkens
2024-09-24 9:57 Ionen Wolkens
2024-09-03 7:44 Ionen Wolkens
2024-09-02 17:52 Ionen Wolkens
2024-07-16 1:29 Ionen Wolkens
2024-07-08 16:40 Arthur Zamarin
2024-07-08 11:16 Arthur Zamarin
2024-07-08 10:09 Sam James
2024-06-18 18:14 Ionen Wolkens
2024-06-08 13:41 Ionen Wolkens
2024-06-08 5:27 Arthur Zamarin
2024-06-04 19:36 Ionen Wolkens
2024-06-02 4:04 Sam James
2024-05-28 18:56 Arthur Zamarin
2024-05-20 8:48 Ionen Wolkens
2024-04-20 14:20 Ionen Wolkens
2024-04-19 7:55 Ionen Wolkens
2024-04-13 17:50 Arthur Zamarin
2024-04-02 13:06 Ionen Wolkens
2024-04-02 6:09 Arthur Zamarin
2024-04-01 18:29 Arthur Zamarin
2024-03-30 0:29 Ionen Wolkens
2024-03-26 7:10 Ionen Wolkens
2024-03-25 22:10 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-22 10:29 Ionen Wolkens
2024-03-22 6:16 Arthur Zamarin
2024-03-12 12:01 Ionen Wolkens
2024-03-07 20:46 Ionen Wolkens
2024-02-22 6:16 Ionen Wolkens
2024-02-20 14:30 Arthur Zamarin
2024-02-14 12:24 Ionen Wolkens
2024-02-10 11:26 Ionen Wolkens
2023-12-19 20:33 Ionen Wolkens
2023-12-19 15:15 Ionen Wolkens
2023-12-17 18:29 Arthur Zamarin
2023-12-12 21:25 Ionen Wolkens
2023-12-01 19:48 Jakov Smolić
2023-12-01 6:21 Sam James
2023-12-01 6:21 Sam James
2023-11-29 22:33 Sam James
2023-11-27 8:47 Ionen Wolkens
2023-11-15 19:28 Ionen Wolkens
2023-11-15 17:20 Arthur Zamarin
2023-10-22 5:55 Ionen Wolkens
2023-10-10 14:51 Ionen Wolkens
2023-09-29 23:29 Ionen Wolkens
2023-09-28 13:07 Ionen Wolkens
2023-09-27 10:03 Ionen Wolkens
2023-09-26 23:08 Ionen Wolkens
2023-09-26 19:48 Ionen Wolkens
2023-09-24 17:22 Ionen Wolkens
2023-09-24 17:09 WANG Xuerui
2023-09-24 17:09 WANG Xuerui
2023-09-22 20:53 Sam James
2023-09-15 4:49 Sam James
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-12 1:28 Sam James
2023-09-12 1:26 Sam James
2023-09-11 22:59 Sam James
2023-09-11 21:20 Ionen Wolkens
2023-09-11 21:20 Ionen Wolkens
2023-09-11 21:20 Ionen Wolkens
2023-09-06 8:49 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-07-26 13:31 Jimi Huotari
2023-07-20 19:41 Jimi Huotari
2023-06-10 13:33 Jimi Huotari
2023-05-06 11:26 Jimi Huotari
2023-04-15 18:39 Jimi Huotari
2023-03-26 16:59 Jimi Huotari
2023-03-19 13:09 Jimi Huotari
2023-02-09 10:02 Andreas Sturmlechner
2023-01-05 22:39 Jimi Huotari
2022-12-01 19:19 Andreas Sturmlechner
2022-09-24 14:32 Andreas Sturmlechner
2022-09-24 14:32 Andreas Sturmlechner
2022-08-02 22:00 Sam James
2022-08-02 21:51 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1736203728.bc54c8b143b2d8986e375d782273465c20b589f9.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox