Skip to content

Commit

Permalink
dev-qt: further revbumps to prevent mixing of Qt versions
Browse files Browse the repository at this point in the history 
Gentoo-bug: 563898
Gentoo-bug: 564560
Gentoo-bug: 564920
Gentoo-bug: 564922
Gentoo-bug: 565806
Gentoo-bug: 566580

Package-Manager: portage-2.2.26
  • Loading branch information
Michael Palimaka committed Jan 15, 2016
1 parent 5c4718a commit bf3cf2b
Show file tree
Hide file tree
Showing 21 changed files with 71 additions and 71 deletions.
16 changes: 8 additions & 8 deletions dev-qt/assistant/assistant-5.5.1.ebuild → dev-qt/assistant/assistant-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions ...inguist-tools/linguist-tools-5.5.1.ebuild → ...uist-tools/linguist-tools-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
12 changes: 6 additions & 6 deletions dev-qt/linguist/linguist-5.5.1.ebuild → dev-qt/linguist/linguist-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
8 changes: 4 additions & 4 deletions dev-qt/pixeltool/pixeltool-5.5.1.ebuild → dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions dev-qt/qdbus/qdbus-5.5.1.ebuild → dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
10 changes: 5 additions & 5 deletions dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild → ...t/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
10 changes: 5 additions & 5 deletions dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild → ...t/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
"

Expand Down
14 changes: 7 additions & 7 deletions .../qtdeclarative/qtdeclarative-5.5.1.ebuild → ...declarative/qtdeclarative-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions dev-qt/qtdiag/qtdiag-5.5.1.ebuild → dev-qt/qtdiag/qtdiag-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions ...aleffects/qtgraphicaleffects-5.5.1.ebuild → ...ffects/qtgraphicaleffects-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...timageformats/qtimageformats-5.5.1.ebuild → ...ageformats/qtimageformats-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:=
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtpaths/qtpaths-5.5.1.ebuild → dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi
IUSE=""

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

Expand Down
6 changes: 3 additions & 3 deletions .../qtpositioning/qtpositioning-5.5.1.ebuild → ...positioning/qtpositioning-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 3 additions & 3 deletions dev-qt/qtscript/qtscript-5.5.1.ebuild → dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions dev-qt/qtsensors/qtsensors-5.5.1.ebuild → dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion ...qt/qtserialport/qtserialport-5.5.1.ebuild → ...qtserialport/qtserialport-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi
IUSE=""

DEPEND="
>=dev-qt/qtcore-${PV}:5
~dev-qt/qtcore-${PV}
virtual/udev
"
RDEPEND="${DEPEND}"
4 changes: 2 additions & 2 deletions ...ttranslations/qttranslations-5.5.1.ebuild → ...anslations/qttranslations-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
6 changes: 3 additions & 3 deletions dev-qt/qtwayland/qtwayland-5.5.1.ebuild → dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...qt/qtwebchannel/qtwebchannel-5.5.1.ebuild → ...qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions ...qt/qtwebsockets/qtwebsockets-5.5.1.ebuild → ...qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions .../qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild → ...xmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

0 comments on commit bf3cf2b

Please sign in to comment.