mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt: further revbumps to prevent mixing of Qt versions
Gentoo-bug: 563898 Gentoo-bug: 564560 Gentoo-bug: 564920 Gentoo-bug: 564922 Gentoo-bug: 565806 Gentoo-bug: 566580 Package-Manager: portage-2.2.26
This commit is contained in:
@@ -15,14 +15,14 @@ fi
|
||||
IUSE="webkit"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qthelp-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
>=dev-qt/qtprintsupport-${PV}:5
|
||||
>=dev-qt/qtsql-${PV}:5[sqlite]
|
||||
>=dev-qt/qtwidgets-${PV}:5
|
||||
webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qthelp-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtsql-${PV}[sqlite]
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
webkit? ( ~dev-qt/qtwebkit-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,9 +15,9 @@ fi
|
||||
IUSE="qml"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtxml-${PV}:5
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,12 +15,12 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/designer-${PV}:5
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qtprintsupport-${PV}:5
|
||||
>=dev-qt/qtwidgets-${PV}:5
|
||||
>=dev-qt/qtxml-${PV}:5
|
||||
~dev-qt/designer-${PV}
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,10 +15,10 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
>=dev-qt/qtwidgets-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,9 +15,9 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtdbus-${PV}:5
|
||||
>=dev-qt/qtxml-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,11 +15,11 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtdbus-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qtwidgets-${PV}:5
|
||||
>=dev-qt/qtxml-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
~dev-qt/qtxml-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,14 +15,14 @@ fi
|
||||
IUSE="qml"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtconcurrent-${PV}:5
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtdbus-${PV}:5
|
||||
~dev-qt/qtconcurrent-${PV}
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdbus-${PV}
|
||||
>=net-wireless/bluez-5
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
@@ -15,13 +15,13 @@ IUSE="gles2 +jit localstorage +widgets xml"
|
||||
|
||||
# qtgui[gles2=] is needed because of bug 504322
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5[gles2=]
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
>=dev-qt/qttest-${PV}:5
|
||||
localstorage? ( >=dev-qt/qtsql-${PV}:5 )
|
||||
widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
|
||||
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}[gles2=]
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qttest-${PV}
|
||||
localstorage? ( ~dev-qt/qtsql-${PV} )
|
||||
widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
|
||||
xml? ( ~dev-qt/qtxmlpatterns-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -15,9 +15,9 @@ fi
|
||||
IUSE="+ssl"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5[ssl=]
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}[ssl=]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -14,11 +14,11 @@ fi
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtdeclarative-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdeclarative-${PV}
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-qt/qtgui-${PV}:5 )
|
||||
test? ( ~dev-qt/qtgui-${PV} )
|
||||
"
|
||||
|
||||
src_test() {
|
||||
@@ -14,8 +14,8 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
media-libs/jasper
|
||||
media-libs/libmng:=
|
||||
media-libs/libwebp:=
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -16,14 +16,14 @@ fi
|
||||
IUSE="geoclue qml"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
geoclue? (
|
||||
app-misc/geoclue:0
|
||||
dev-libs/glib:2
|
||||
)
|
||||
qml? (
|
||||
>=dev-qt/qtdeclarative-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
~dev-qt/qtdeclarative-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@@ -14,10 +14,10 @@ fi
|
||||
IUSE="+jit scripttools"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
scripttools? (
|
||||
>=dev-qt/qtgui-${PV}:5
|
||||
>=dev-qt/qtwidgets-${PV}:5
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -14,8 +14,8 @@ fi
|
||||
IUSE="qml"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
@@ -14,7 +14,7 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
virtual/udev
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -14,7 +14,7 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/linguist-tools-${PV}:5
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
~dev-qt/linguist-tools-${PV}
|
||||
~dev-qt/qtcore-${PV}
|
||||
"
|
||||
RDEPEND=""
|
||||
@@ -15,12 +15,12 @@ IUSE="egl qml wayland-compositor xcomposite"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/wayland-1.4.0
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtgui-${PV}:5[egl=]
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtgui-${PV}[egl=]
|
||||
media-libs/mesa[egl?]
|
||||
>=x11-libs/libxkbcommon-0.2.0
|
||||
wayland-compositor? (
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
)
|
||||
xcomposite? (
|
||||
x11-libs/libX11
|
||||
@@ -14,8 +14,8 @@ fi
|
||||
IUSE="qml"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -14,9 +14,9 @@ fi
|
||||
IUSE="qml"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
qml? ( ~dev-qt/qtdeclarative-${PV} )
|
||||
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -14,7 +14,7 @@ fi
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtcore-${PV}:5
|
||||
>=dev-qt/qtnetwork-${PV}:5
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
Reference in New Issue
Block a user