aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-10-07 14:23:40 +1100
committerMichael Palimaka <kensington@gentoo.org>2017-10-07 14:38:03 +1100
commit71a304ff572407c07cf4c0708ff0e9b9d901487e (patch)
treec23bef9d9932ea20d919ce9664489733c3486acc
parentdev-qt/qtwebview: delete extra newline (diff)
downloadqt-71a304ff572407c07cf4c0708ff0e9b9d901487e.tar.gz
qt-71a304ff572407c07cf4c0708ff0e9b9d901487e.tar.bz2
qt-71a304ff572407c07cf4c0708ff0e9b9d901487e.zip
dev-qt/qtwebkit: unpin dev-qt dependencies
dev-qt/qtwebkit is no longer being released together with the rest of Qt, so pinned dependencies no longer make sense. This is a followup to b0c5d8c3dd86479acbd325dac93a104c200a767c. Bug: https://bugs.gentoo.org/624404 Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild27
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild27
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.9999.ebuild27
3 files changed, 42 insertions, 39 deletions
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index dc432beb..213c19f9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -3,6 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1"
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -22,11 +23,11 @@ RDEPEND="
>=dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
- ~dev-qt/qtcore-${PV}[icu]
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
+ >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+ >=dev-qt/qtgui-${QT_MIN_VER}
+ >=dev-qt/qtnetwork-${QT_MIN_VER}
+ >=dev-qt/qtsql-${QT_MIN_VER}
+ >=dev-qt/qtwidgets-${QT_MIN_VER}
media-libs/fontconfig:1.0
media-libs/libpng:0=
>=sys-libs/zlib-1.2.5
@@ -35,21 +36,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
+ >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+ >=dev-qt/qtopengl-${QT_MIN_VER}
)
- orientation? ( ~dev-qt/qtsensors-${PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${PV} )
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+ orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+ webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
index dc432beb..213c19f9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
@@ -3,6 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1"
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -22,11 +23,11 @@ RDEPEND="
>=dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
- ~dev-qt/qtcore-${PV}[icu]
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
+ >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+ >=dev-qt/qtgui-${QT_MIN_VER}
+ >=dev-qt/qtnetwork-${QT_MIN_VER}
+ >=dev-qt/qtsql-${QT_MIN_VER}
+ >=dev-qt/qtwidgets-${QT_MIN_VER}
media-libs/fontconfig:1.0
media-libs/libpng:0=
>=sys-libs/zlib-1.2.5
@@ -35,21 +36,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
+ >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+ >=dev-qt/qtopengl-${QT_MIN_VER}
)
- orientation? ( ~dev-qt/qtsensors-${PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${PV} )
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+ orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+ webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index dc432beb..213c19f9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -3,6 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1"
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -22,11 +23,11 @@ RDEPEND="
>=dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
- ~dev-qt/qtcore-${PV}[icu]
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
+ >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+ >=dev-qt/qtgui-${QT_MIN_VER}
+ >=dev-qt/qtnetwork-${QT_MIN_VER}
+ >=dev-qt/qtsql-${QT_MIN_VER}
+ >=dev-qt/qtwidgets-${QT_MIN_VER}
media-libs/fontconfig:1.0
media-libs/libpng:0=
>=sys-libs/zlib-1.2.5
@@ -35,21 +36,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
+ >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+ >=dev-qt/qtopengl-${QT_MIN_VER}
)
- orientation? ( ~dev-qt/qtsensors-${PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${PV} )
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+ orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+ webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}