From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B5D31381FA for ; Sun, 18 May 2014 20:05:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2005E0931; Sun, 18 May 2014 20:05:17 +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 35C47E08A1 for ; Sun, 18 May 2014 20:05:17 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 315B833F87D for ; Sun, 18 May 2014 20:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C240F1818D for ; Sun, 18 May 2014 20:05:14 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1400441773.9990afda36c5d276b01dbf0533e8d2d30069087d.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/metadata.xml dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 9990afda36c5d276b01dbf0533e8d2d30069087d X-VCS-Branch: master Date: Sun, 18 May 2014 20:05:14 +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: 2205bbb5-798f-4a30-bdde-871ed32cff66 X-Archives-Hash: 2cb12ad8ff0601d233ea75e837b50943 commit: 9990afda36c5d276b01dbf0533e8d2d30069087d Author: Axel Rasmussen gmail com> AuthorDate: Sat May 17 05:35:08 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun May 18 19:36:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9990afda [dev-qt/qtwebkit:5] Add printsupport USE flag This commit updates the =dev-qt/qtwebkit-5.3.0_rc ebuild to allow for enabling/disabling of its qtprintsupport dependency. --- dev-qt/qtwebkit/metadata.xml | 1 + dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild | 25 ++++++++++++++----------- dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 25 ++++++++++++++----------- dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 25 ++++++++++++++----------- 4 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index 7676f35..952e31f 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -8,6 +8,7 @@ Enable HTML5 audio/video support via media-libs/gstreamer Use dev-libs/libxml2 for XML parsing Enable HTML5 audio/video support via dev-qt/qtmultimedia + Enable printing via dev-qt/qtprintsupport Build QML/QtQuick bindings Add support for WebP image format Build various things that depend on dev-qt/qtwidgets, diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild index 80b12e7..9b5046c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild @@ -16,9 +16,9 @@ else KEYWORDS="~amd64" fi -# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors +# TODO: qttestlib, geolocation, orientation/sensors -IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" +IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite:3 @@ -42,6 +42,7 @@ RDEPEND=" libxml2? ( dev-libs/libxml2:2 ) multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] ) opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) + printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] ) qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) @@ -64,22 +65,24 @@ pkg_setup() { } src_prepare() { - use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ + use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ Tools/qmake/mkspecs/features/features.prf || die - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ + use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ + use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ + use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ Tools/qmake/mkspecs/features/features.prf || die - use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ + use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ Source/QtWebKit.pro || die - use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ + use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ Tools/qmake/mkspecs/features/features.prf || die # bug 458222 diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild index 80b12e7..9b5046c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild @@ -16,9 +16,9 @@ else KEYWORDS="~amd64" fi -# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors +# TODO: qttestlib, geolocation, orientation/sensors -IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" +IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite:3 @@ -42,6 +42,7 @@ RDEPEND=" libxml2? ( dev-libs/libxml2:2 ) multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] ) opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) + printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] ) qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) @@ -64,22 +65,24 @@ pkg_setup() { } src_prepare() { - use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ + use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ Tools/qmake/mkspecs/features/features.prf || die - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ + use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ + use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ + use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ Tools/qmake/mkspecs/features/features.prf || die - use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ + use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ Source/QtWebKit.pro || die - use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ + use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ Tools/qmake/mkspecs/features/features.prf || die # bug 458222 diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 80b12e7..9b5046c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -16,9 +16,9 @@ else KEYWORDS="~amd64" fi -# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors +# TODO: qttestlib, geolocation, orientation/sensors -IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" +IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite:3 @@ -42,6 +42,7 @@ RDEPEND=" libxml2? ( dev-libs/libxml2:2 ) multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] ) opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) + printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] ) qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) @@ -64,22 +65,24 @@ pkg_setup() { } src_prepare() { - use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ + use gstreamer || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \ Tools/qmake/mkspecs/features/features.prf || die - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ + use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ + use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ + use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ Tools/qmake/mkspecs/features/features.prf || die - use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ + use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ Source/QtWebKit.pro || die - use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ + use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ Tools/qmake/mkspecs/features/features.prf || die # bug 458222