commit: 52cc4a50ab5d32ba75d489a16cba62557cc12dce
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 16:52:15 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=52cc4a50
dev-qt/qtwebkit: use qt_use_disable_mod
Package-Manager: portage-2.2.20.1
dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild | 7 +++----
dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild | 7 +++----
dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 7 +++----
dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild | 7 +++----
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 7 +++----
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
- Tools/qmake/mkspecs/features/features.prf || die
+
+ 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
- use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
- Tools/qmake/mkspecs/features/features.prf || die
+
+ 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
- use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
- Tools/qmake/mkspecs/features/features.prf || die
+
+ 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
- use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
- Tools/qmake/mkspecs/features/features.prf || die
+
+ 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
- use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
- use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
- Tools/qmake/mkspecs/features/features.prf || die
+
+ 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
- use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
