From 7b52211322fe8853d689573235297ad317d8ffdd Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 22 Nov 2020 21:52:39 +0100 Subject: [PATCH] dev-qt: Block colliding old dev-qt/qtchooser versions Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner --- dev-qt/assistant/assistant-5.15.9999.ebuild | 5 ++++- dev-qt/linguist/linguist-5.15.9999.ebuild | 5 ++++- dev-qt/qdbus/qdbus-5.15.9999.ebuild | 7 +++++-- dev-qt/qdbusviewer/qdbusviewer-5.15.9999.ebuild | 7 +++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-qt/assistant/assistant-5.15.9999.ebuild b/dev-qt/assistant/assistant-5.15.9999.ebuild index 7f0b3ec1e..e666fcc13 100644 --- a/dev-qt/assistant/assistant-5.15.9999.ebuild +++ b/dev-qt/assistant/assistant-5.15.9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils @@ -23,7 +24,9 @@ DEPEND=" ~dev-qt/qtwidgets-${PV} webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<=dev-qt/qtchooser-66 +" QT5_TARGET_SUBDIRS=( src/assistant/assistant diff --git a/dev-qt/linguist/linguist-5.15.9999.ebuild b/dev-qt/linguist/linguist-5.15.9999.ebuild index 4aa1294c5..9f28d1f5a 100644 --- a/dev-qt/linguist/linguist-5.15.9999.ebuild +++ b/dev-qt/linguist/linguist-5.15.9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils @@ -21,7 +22,9 @@ DEPEND=" ~dev-qt/qtwidgets-${PV} ~dev-qt/qtxml-${PV} " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<=dev-qt/qtchooser-66 +" QT5_TARGET_SUBDIRS=( src/linguist/linguist diff --git a/dev-qt/qdbus/qdbus-5.15.9999.ebuild b/dev-qt/qdbus/qdbus-5.15.9999.ebuild index 4e1b43628..dafd3c64b 100644 --- a/dev-qt/qdbus/qdbus-5.15.9999.ebuild +++ b/dev-qt/qdbus/qdbus-5.15.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qttools" inherit qt5-build @@ -18,7 +19,9 @@ DEPEND=" ~dev-qt/qtdbus-${PV} ~dev-qt/qtxml-${PV} " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<=dev-qt/qtchooser-66 +" QT5_TARGET_SUBDIRS=( src/qdbus/qdbus diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.9999.ebuild index 995902b9e..f055efa96 100644 --- a/dev-qt/qdbusviewer/qdbusviewer-5.15.9999.ebuild +++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils @@ -20,7 +21,9 @@ DEPEND=" ~dev-qt/qtwidgets-${PV} ~dev-qt/qtxml-${PV} " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !<=dev-qt/qtchooser-66 +" QT5_TARGET_SUBDIRS=( src/qdbus/qdbusviewer