[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Sat, 17 Oct 2015 17:02:52 +0000 (UTC)	[thread overview]
Message-ID: <1445101362.52cc4a50ab5d32ba75d489a16cba62557cc12dce.kensington@gentoo> (raw)

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' \

next             reply	other threads:[~2015-10-17 17:02 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-17 17:02 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-24  9:08 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2020-03-11 17:13 Andreas Sturmlechner
2020-01-14 22:55 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2019-10-23  6:35 Andreas Sturmlechner
2019-07-06 10:28 Andreas Sturmlechner
2018-06-18 13:34 Jimi Huotari
2017-10-07  6:09 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-07-23 11:57 Michael Palimaka
2017-07-23 11:35 Michael Palimaka
2017-07-23 10:30 Michael Palimaka
2017-07-23  8:36 Michael Palimaka
2017-06-18  7:54 Michael Palimaka
2017-06-11 13:09 Michael Palimaka
2016-04-23 17:20 Michael Palimaka
2016-04-09 15:48 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-02 13:54 Michael Palimaka
2016-04-01 15:26 Michael Palimaka
2016-03-17  9:43 Michael Palimaka
2016-01-20 17:35 Davide Pesavento
2016-01-19 19:19 Davide Pesavento
2015-10-17 17:02 Michael Palimaka
2015-10-17 17:02 Michael Palimaka
2015-07-10 14:43 Davide Pesavento
2015-06-23 12:49 Vladimir Smirnov
2015-04-26 23:12 Davide Pesavento
2015-03-26  1:49 Davide Pesavento
2015-03-15 14:44 Michael Palimaka
2015-03-05  9:49 Michael Palimaka
2015-01-11 18:17 Davide Pesavento
2014-10-22 17:27 Michael Palimaka
2014-09-28 17:40 Davide Pesavento
2014-09-02  0:08 Davide Pesavento
2014-06-10  7:58 Michael Palimaka
2014-05-26 13:35 Davide Pesavento
2014-05-18 20:05 Davide Pesavento
2014-02-26 11:39 Michael Palimaka
2013-10-20 23:03 Davide Pesavento
2013-08-08 10:53 Michael Palimaka
2013-08-06  8:04 Michael Palimaka
2013-04-07 23:11 Davide Pesavento

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:44acff5 dfblob:e912401 dfblob:44acff5 dfblob:e912401
dfblob:44acff5 dfblob:e912401 dfblob:44acff5 dfblob:e912401
dfblob:44acff5 dfblob:e912401 )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445101362.52cc4a50ab5d32ba75d489a16cba62557cc12dce.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox