From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0BA33138BED for ; Sat, 17 Oct 2015 17:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8306721C0E1; Sat, 17 Oct 2015 17:02:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2A5E21C0E1 for ; Sat, 17 Oct 2015 17:02:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6B283408F9 for ; Sat, 17 Oct 2015 17:02:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D52E11A7 for ; Sat, 17 Oct 2015 17:02:52 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445101362.52cc4a50ab5d32ba75d489a16cba62557cc12dce.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 52cc4a50ab5d32ba75d489a16cba62557cc12dce X-VCS-Branch: master Date: Sat, 17 Oct 2015 17:02:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cb1b3d53-e6e9-4fc0-9c18-0b3a92f89e2a X-Archives-Hash: 7afc120051ee1ad3c5cb8733228691d5 commit: 52cc4a50ab5d32ba75d489a16cba62557cc12dce Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 17 16:52:15 2015 +0000 Commit: Michael Palimaka gentoo 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' \