commit: 8da627627bbf229d286f89f8b3400bdafa16623e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 17:02:23 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 17:02:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8da62762
dev-qt/qtwebkit: solve various automagic dependencies
Gentoo-bug: 560150
Package-Manager: portage-2.2.20.1
dev-qt/qtwebkit/metadata.xml | 3 +++
dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild | 18 ++++++++++++------
dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild | 18 ++++++++++++------
dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 18 ++++++++++++------
dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild | 18 ++++++++++++------
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 18 ++++++++++++------
6 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0ca02a9..0aa2516 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,11 +5,14 @@
<use>
<flag name="exceptions">Add support for exceptions - like
catching them
inside the event loop (recommended by upstream)</flag>
+ <flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="gstreamer">Enable HTML5 audio/video support via
<pkg>media-libs/gstreamer:1.0</pkg></flag>
<flag name="gstreamer010">Enable HTML5 audio/video support via
<pkg>media-libs/gstreamer:0.10</pkg></flag>
<flag name="multimedia">Enable HTML5 audio/video support via
<pkg>dev-qt/qtmultimedia</pkg></flag>
+ <flag name="orientation">Enable device orientation detection
via <pkg>dev-qt/qtsensors</pkg></flag>
<flag name="printsupport">Enable printing via
<pkg>dev-qt/qtprintsupport</pkg></flag>
<flag name="qml">Build QML/QtQuick bindings</flag>
+ <flag name="webchannel">Enable integration with
<pkg>dev-qt/qtwebchannel</pkg></flag>
<flag name="webp">Add support for WebP image format</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation
printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
- qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
- use qml || sed -i -e '/have?(QTQUICK): SUBDIRS +=
declarative/d' \
- Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation
printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
- qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
- use qml || sed -i -e '/have?(QTQUICK): SUBDIRS +=
declarative/d' \
- Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation
printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
- qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
- use qml || sed -i -e '/have?(QTQUICK): SUBDIRS +=
declarative/d' \
- Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation
printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
- qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
- use qml || sed -i -e '/have?(QTQUICK): SUBDIRS +=
declarative/d' \
- Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation
printsupport qml webchannel webp"
REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+ geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
\
|| die
+ qt_use_disable_mod geolocation positioning
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod orientation sensors
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+ qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- qt_use_disable_mod multimedia multimediawidgets
Tools/qmake/mkspecs/features/features.prf
use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
- qt_use_disable_mod printsupport printsupport
Tools/qmake/mkspecs/features/features.prf
- use qml || sed -i -e '/have?(QTQUICK): SUBDIRS +=
declarative/d' \
- Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
