Skip to content

Commit

Permalink
dev-qt: Switch from ~PV to =QT5_PV* version dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Sep 30, 2021
1 parent 22ffce7 commit 8934bbb
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 42 deletions.
12 changes: 6 additions & 6 deletions dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
IUSE=""

DEPEND="
~dev-qt/qtcore-${PV}:5=
=dev-qt/qtcore-${QT5_PV}*:5=
"
RDEPEND="${DEPEND}"

Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 3 additions & 3 deletions dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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:= )
Expand Down
14 changes: 7 additions & 7 deletions dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
8 changes: 4 additions & 4 deletions dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
4 changes: 2 additions & 2 deletions dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
)
"
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
8 changes: 4 additions & 4 deletions dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}* )
"
6 changes: 3 additions & 3 deletions dev-qt/qttest/qttest-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}*
)
"

Expand Down
4 changes: 2 additions & 2 deletions dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}*"
6 changes: 3 additions & 3 deletions dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
4 changes: 2 additions & 2 deletions dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down

0 comments on commit 8934bbb

Please sign in to comment.