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 A43081581F0 for ; Fri, 24 Jan 2025 20:10:23 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8CB5734352D for ; Fri, 24 Jan 2025 20:10:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2FC9B11042F; Fri, 24 Jan 2025 20:10:18 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id 24EFE11042F for ; Fri, 24 Jan 2025 20:10: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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE112343533 for ; Fri, 24 Jan 2025 20:10:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39A6B20D7 for ; Fri, 24 Jan 2025 20:10:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1737749404.5f9b349b46849040064e129259bb5e8feb01561a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/doxygen/doxygen-1.13.0-r1.ebuild app-text/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-text/doxygen/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5f9b349b46849040064e129259bb5e8feb01561a X-VCS-Branch: master Date: Fri, 24 Jan 2025 20:10:16 +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: f8b737b7-9ffb-43b5-8fec-65ecbaeb2e7c X-Archives-Hash: 6d98f9612f52b32bb4d1d290825bb34a commit: 5f9b349b46849040064e129259bb5e8feb01561a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 20 20:36:22 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 24 20:10:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9b349b app-text/doxygen: Switch to Qt6 Bug: https://bugs.gentoo.org/948583 Signed-off-by: Andreas Sturmlechner gentoo.org> .../{doxygen-9999.ebuild => doxygen-1.13.0-r1.ebuild} | 12 +++--------- app-text/doxygen/doxygen-9999.ebuild | 10 +++------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-1.13.0-r1.ebuild similarity index 96% copy from app-text/doxygen/doxygen-9999.ebuild copy to app-text/doxygen/doxygen-1.13.0-r1.ebuild index 5adf958ddb5d..21d6fc146c4e 100644 --- a/app-text/doxygen/doxygen-9999.ebuild +++ b/app-text/doxygen/doxygen-1.13.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,20 +63,13 @@ RDEPEND=" dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) + gui? ( dev-qt/qtbase:6[gui,widgets,xml] ) " DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch" - - # Backports ) DOCS=( LANGUAGE.HOWTO README.md ) @@ -117,6 +110,7 @@ src_configure() { -Dbuild_doc=$(usex doc) -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex gui) + -Dforce_qt=Qt6 -Duse_sys_spdlog=ON -Duse_sys_sqlite3=ON -DBUILD_SHARED_LIBS=OFF diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild index 5adf958ddb5d..22a506445848 100644 --- a/app-text/doxygen/doxygen-9999.ebuild +++ b/app-text/doxygen/doxygen-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,12 +63,7 @@ RDEPEND=" dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) + gui? ( dev-qt/qtbase:6[gui,widgets,xml] ) " DEPEND="${RDEPEND}" @@ -117,6 +112,7 @@ src_configure() { -Dbuild_doc=$(usex doc) -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex gui) + -Dforce_qt=Qt6 -Duse_sys_spdlog=ON -Duse_sys_sqlite3=ON -DBUILD_SHARED_LIBS=OFF