dev-qt: Add RDEPEND on dev-qt/qtchooser where link targets exist

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-11-25 22:27:58 +01:00
parent e0111ad572
commit 072da15f03
15 changed files with 57 additions and 17 deletions

View File

@@ -23,7 +23,9 @@ DEPEND="
~dev-qt/qtxml-${PV}
declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
src_prepare() {
qt_use_disable_mod declarative quickwidgets \

View File

@@ -2,6 +2,7 @@
# 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/qtxml-${PV}
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
QT5_TARGET_SUBDIRS=(
src/linguist

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qttools"
inherit qt5-build
@@ -18,4 +19,6 @@ DEPEND="
~dev-qt/qtgui-${PV}:5=
~dev-qt/qtwidgets-${PV}
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qttools"
inherit qt5-build
@@ -18,7 +19,9 @@ DEPEND="
sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
src_prepare() {
qt_use_disable_mod qml qmldevtools-private \

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit qt5-build
DESCRIPTION="3D rendering module for the Qt5 framework"
@@ -13,7 +14,7 @@ fi
# TODO: tools
IUSE="gamepad gles2-only qml vulkan"
RDEPEND="
COMMON_DEPEND="
~dev-qt/qtconcurrent-${PV}
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}:5=[vulkan=]
@@ -22,9 +23,12 @@ RDEPEND="
gamepad? ( ~dev-qt/qtgamepad-${PV} )
qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
"
DEPEND="${RDEPEND}
DEPEND="${COMMON_DEPEND}
vulkan? ( dev-util/vulkan-headers )
"
RDEPEND="${COMMON_DEPEND}
dev-qt/qtchooser
"
src_prepare() {
rm -r src/3rdparty/assimp/{code,contrib,include} || die

View File

@@ -26,6 +26,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!<dev-qt/qtcore-4.8.7-r4:4
dev-qt/qtchooser
"
QT5_TARGET_SUBDIRS=(

View File

@@ -17,7 +17,9 @@ DEPEND="
~dev-qt/qtcore-${PV}:5=
>=sys-apps/dbus-1.4.20
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
QT5_TARGET_SUBDIRS=(
src/dbus

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit python-any-r1 qt5-build
@@ -23,7 +24,9 @@ DEPEND="
localstorage? ( ~dev-qt/qtsql-${PV} )
widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qttools"
inherit qt5-build
@@ -13,16 +14,19 @@ fi
IUSE="+network +widgets"
RDEPEND="
COMMON_DEPEND="
~dev-qt/qtcore-${PV}:5=
~dev-qt/qtgui-${PV}:5=
network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
# TODO: we know it is bogus, figure out how to disable checks, bug 728278
DEPEND="${RDEPEND}
DEPEND="${COMMON_DEPEND}
~dev-qt/qtxml-${PV}
"
RDEPEND="${COMMON_DEPEND}
dev-qt/qtchooser
"
src_prepare() {
qt_use_disable_mod network network \

View File

@@ -26,7 +26,7 @@ REQUIRED_USE="
X? ( gles2-only? ( egl ) )
"
RDEPEND="
COMMON_DEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}:5=
dev-util/gtk-update-icon-cache
@@ -66,10 +66,13 @@ RDEPEND="
x11-libs/xcb-util-wm
)
"
DEPEND="${RDEPEND}
DEPEND="${COMMON_DEPEND}
evdev? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
RDEPEND="${COMMON_DEPEND}
dev-qt/qtchooser
"
PDEPEND="
ibus? ( app-i18n/ibus )
wayland? ( ~dev-qt/qtwayland-${PV} )

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qttools"
inherit qt5-build
@@ -20,7 +21,9 @@ DEPEND="
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
QT5_TARGET_SUBDIRS=(
src/assistant/help

View File

@@ -16,4 +16,6 @@ IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"

View File

@@ -16,4 +16,6 @@ IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"

View File

@@ -25,7 +25,9 @@ DEPEND="
x11-libs/pango
)
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
QT5_TARGET_SUBDIRS=(
src/tools/uic

View File

@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit qt5-build
DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
@@ -17,7 +18,9 @@ DEPEND="
~dev-qt/qtnetwork-${PV}
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
dev-qt/qtchooser
"
src_prepare() {
qt_use_disable_mod qml qml \