From 8934bbb6174ce9e379e281eecb02b080583d3d8e Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 30 Sep 2021 10:08:52 +0200 Subject: [PATCH] dev-qt: Switch from ~PV to =QT5_PV* version dependencies Signed-off-by: Andreas Sturmlechner --- dev-qt/qt3d/qt3d-5.15.2-r10.ebuild | 12 ++++++------ dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild | 2 +- dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild | 2 +- dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild | 6 +++--- .../qtimageformats-5.15.2-r10.ebuild | 4 ++-- dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild | 14 +++++++------- .../qtprintsupport-5.15.2-r10.ebuild | 8 ++++---- dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild | 4 ++-- dev-qt/qtsql/qtsql-5.15.2-r10.ebuild | 2 +- dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild | 8 ++++---- dev-qt/qttest/qttest-5.15.2-r10.ebuild | 6 +++--- .../qttranslations-5.15.2-r10.ebuild | 4 ++-- dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild | 6 +++--- dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild | 2 +- dev-qt/qtxml/qtxml-5.15.2-r10.ebuild | 4 ++-- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild index 5d0cb68569d8b..d62d584d0628d 100644 --- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild +++ b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild @@ -16,13 +16,13 @@ fi IUSE="gamepad gles2-only qml vulkan" RDEPEND=" - ~dev-qt/qtconcurrent-${PV} - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[vulkan=] - ~dev-qt/qtnetwork-${PV} + =dev-qt/qtconcurrent-${QT5_PV}* + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] + =dev-qt/qtnetwork-${QT5_PV}* >=media-libs/assimp-4.0.0 - gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) + gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) + qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) " DEPEND="${RDEPEND} vulkan? ( dev-util/vulkan-headers ) diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild index feb85fe83e05b..328a9f1432448 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild @@ -16,7 +16,7 @@ fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild index 97954168dbef8..c941e4ff22d80 100644 --- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild @@ -16,7 +16,7 @@ fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= >=sys-apps/dbus-1.4.20 " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild index 70434d09b66ac..8dcfeeb41e683 100644 --- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild +++ b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild @@ -14,10 +14,10 @@ fi IUSE="evdev qml sdl" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[evdev?] + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*[evdev?] evdev? ( virtual/libudev:= ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) sdl? ( media-libs/libsdl2 ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild index 4931c36693130..c132f79eb2ceb 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild @@ -15,8 +15,8 @@ fi IUSE="mng" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild index bd45076277058..e188210cae30f 100644 --- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild +++ b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild @@ -18,16 +18,16 @@ IUSE="" RDEPEND=" dev-libs/icu:= - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV}[qml] - ~dev-qt/qtsql-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtpositioning-${QT5_PV}*[qml] + =dev-qt/qtsql-${QT5_PV}* sys-libs/zlib " DEPEND="${RDEPEND} - ~dev-qt/qtconcurrent-${PV} + =dev-qt/qtconcurrent-${QT5_PV}* " QT5_TARGET_SUBDIRS=( diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild index 871e2ba4d5911..5bf7883dbf8c5 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild @@ -17,13 +17,13 @@ fi IUSE="cups gles2-only" RDEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] cups? ( >=net-print/cups-1.4 ) " DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) + test? ( =dev-qt/qtnetwork-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=( diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild index c2273fe433d17..2ba5257f660a4 100644 --- a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild +++ b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild @@ -15,10 +15,10 @@ IUSE="alsa flite" RDEPEND=" >=app-accessibility/speech-dispatcher-0.8.7 - ~dev-qt/qtcore-${PV} + =dev-qt/qtcore-${QT5_PV}* flite? ( >=app-accessibility/flite-2[alsa?] - ~dev-qt/qtmultimedia-${PV}[alsa?] + =dev-qt/qtmultimedia-${QT5_PV}*[alsa?] alsa? ( media-libs/alsa-lib ) ) " diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild index d38357ed20baa..5e3139adc3824 100644 --- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE=" " DEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild index 8ec99ee644246..35c7a6dafaa77 100644 --- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild +++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild @@ -15,11 +15,11 @@ fi IUSE="" RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* sys-libs/zlib:= " DEPEND="${RDEPEND} - test? ( ~dev-qt/qtxml-${PV} ) + test? ( =dev-qt/qtxml-${QT5_PV}* ) " diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild index c662b55cdf2f4..31c93a5744839 100644 --- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild +++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild @@ -17,12 +17,12 @@ fi IUSE="" RDEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= " DEPEND="${RDEPEND} test? ( - ~dev-qt/qtgui-${PV} - ~dev-qt/qtxml-${PV} + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* ) " diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild index f45c8d00c6050..f5f2653d1d403 100644 --- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild +++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild @@ -14,5 +14,5 @@ fi IUSE="" -DEPEND="=dev-qt/qtcore-${PV}*" -BDEPEND="=dev-qt/linguist-tools-${PV}*" +DEPEND="=dev-qt/qtcore-${QT5_PV}*" +BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*" diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild index 5910e9c5d92c0..8dad56cf5aecc 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild @@ -15,9 +15,9 @@ fi IUSE="qml +ssl" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV}[ssl=] - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}*[ssl=] + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild index a1b3c1180fbd7..29f8f00361208 100644 --- a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild +++ b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild @@ -17,6 +17,6 @@ DEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtdeclarative-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}* - =dev-qt/qtwebengine-${PV}*:5 + =dev-qt/qtwebengine-${QT5_PV}*:5 " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild index 27bede818a87f..196504a076587 100644 --- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild +++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild @@ -16,10 +16,10 @@ fi IUSE="" RDEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= " DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) + test? ( =dev-qt/qtnetwork-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=(