commit: b190863ca496027fea1264d3be19be8863377eee Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Nov 22 08:00:07 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 08:21:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b190863c
dev-qt/qttools: softblock conflicting qt5 packages/versions Three of these are gone but still add blockers for old updates. Closes: https://bugs.gentoo.org/966328 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../{qttools-6.10.1.ebuild => qttools-6.10.1-r1.ebuild} | 15 ++++++++++++--- dev-qt/qttools/qttools-6.10.9999.ebuild | 14 ++++++++++++-- dev-qt/qttools/qttools-6.9999.ebuild | 14 ++++++++++++-- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dev-qt/qttools/qttools-6.10.1.ebuild b/dev-qt/qttools/qttools-6.10.1-r1.ebuild similarity index 91% rename from dev-qt/qttools/qttools-6.10.1.ebuild rename to dev-qt/qttools/qttools-6.10.1-r1.ebuild index f16f3c5a50a2..eb974cfbd2f1 100644 --- a/dev-qt/qttools/qttools-6.10.1.ebuild +++ b/dev-qt/qttools/qttools-6.10.1-r1.ebuild @@ -37,13 +37,22 @@ REQUIRED_USE=" RDEPEND=" ~dev-qt/qtbase-${PV}:6[widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] ) + assistant? ( + ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] + !dev-qt/assistant:5 + ) designer? ( ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] zstd? ( app-arch/zstd:= ) - !<dev-qt/designer-6.15.18-r1 + !<dev-qt/designer-5.15.18-r1:5 + ) + linguist? ( + widgets? ( !dev-qt/linguist:5 ) + ) + qdbus? ( + ~dev-qt/qtbase-${PV}:6[dbus,xml] + widgets? ( !dev-qt/qdbusviewer:5 ) ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qdoc? ( $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}= diff --git a/dev-qt/qttools/qttools-6.10.9999.ebuild b/dev-qt/qttools/qttools-6.10.9999.ebuild index 2d98daaaa476..eb974cfbd2f1 100644 --- a/dev-qt/qttools/qttools-6.10.9999.ebuild +++ b/dev-qt/qttools/qttools-6.10.9999.ebuild @@ -37,12 +37,22 @@ REQUIRED_USE=" RDEPEND=" ~dev-qt/qtbase-${PV}:6[widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] ) + assistant? ( + ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] + !dev-qt/assistant:5 + ) designer? ( ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] zstd? ( app-arch/zstd:= ) + !<dev-qt/designer-5.15.18-r1:5 + ) + linguist? ( + widgets? ( !dev-qt/linguist:5 ) + ) + qdbus? ( + ~dev-qt/qtbase-${PV}:6[dbus,xml] + widgets? ( !dev-qt/qdbusviewer:5 ) ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qdoc? ( $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}= diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 2d98daaaa476..eb974cfbd2f1 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -37,12 +37,22 @@ REQUIRED_USE=" RDEPEND=" ~dev-qt/qtbase-${PV}:6[widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] ) + assistant? ( + ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] + !dev-qt/assistant:5 + ) designer? ( ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] zstd? ( app-arch/zstd:= ) + !<dev-qt/designer-5.15.18-r1:5 + ) + linguist? ( + widgets? ( !dev-qt/linguist:5 ) + ) + qdbus? ( + ~dev-qt/qtbase-${PV}:6[dbus,xml] + widgets? ( !dev-qt/qdbusviewer:5 ) ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qdoc? ( $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}=
