patrick     14/04/23 07:18:25

  Modified:             metadata.xml ChangeLog
  Added:                qtwebkit-5.2.1.ebuild
  Log:
  Import qt5 from qt overlay
  
  (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.3                  dev-qt/qtwebkit/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml        26 Jan 2014 18:11:46 -0000      1.2
+++ metadata.xml        23 Apr 2014 07:18:25 -0000      1.3
@@ -6,6 +6,13 @@
                <flag name="exceptions">Add support for exceptions - like 
catching them
                        inside the event loop (recommended by upstream)</flag>
                <flag name="gstreamer">Enable HTML5 audio/video support via 
<pkg>media-libs/gstreamer</pkg></flag>
+                <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML 
parsing</flag>
+                <flag name="multimedia">Enable HTML5 audio/video support via 
<pkg>dev-qt/qtmultimedia</pkg></flag>
+                <flag name="qml">Build QML/QtQuick bindings</flag>
+                <flag name="webp">Add support for WebP image format</flag>
+                <flag name="widgets">Build various things that depend on 
<pkg>dev-qt/qtwidgets</pkg>,
+                        e.g. the WebKitWidgets library</flag>
+                <flag name="xslt">Enable XSLT support</flag>
        </use>
        <upstream>
                <bugs-to>https://bugreports.qt-project.org/</bugs-to>



1.12                 dev-qt/qtwebkit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   26 Jan 2014 18:11:46 -0000      1.11
+++ ChangeLog   23 Apr 2014 07:18:25 -0000      1.12
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.11 2014/01/26 
18:11:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.12 2014/04/23 
07:18:25 patrick Exp $
+
+*qtwebkit-5.2.1 (23 Apr 2014)
+
+  23 Apr 2014; Patrick Lauer <patr...@gentoo.org>
+  +files/qtwebkit-5.2.1-disable-gstreamer.patch, +qtwebkit-5.2.1.ebuild,
+  metadata.xml:
+  Import qt5 from qt overlay
 
   26 Jan 2014; Davide Pesavento <p...@gentoo.org> -qtwebkit-4.8.4.ebuild,
   metadata.xml:



1.1                  dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild?rev=1.1&content-type=text/plain

Index: qtwebkit-5.2.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild,v 1.1 
2014/04/23 07:18:25 patrick Exp $

EAPI=5

PYTHON_COMPAT=( python{2_6,2_7} )

inherit python-any-r1 qt5-build

DESCRIPTION="The Qt toolkit is a comprehensive C++ application development 
framework"

if [[ ${QT5_BUILD_TYPE} == live ]]; then
        KEYWORDS=""
else
        KEYWORDS="~amd64"
fi

# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors

IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"

RDEPEND="
        dev-db/sqlite:3
        >=dev-qt/qtcore-${PV}:5[debug=,icu]
        >=dev-qt/qtgui-${PV}:5[debug=]
        >=dev-qt/qtnetwork-${PV}:5[debug=]
        >=dev-qt/qtsql-${PV}:5[debug=]
        media-libs/fontconfig:1.0
        media-libs/libpng:0=
        sys-libs/zlib
        virtual/jpeg:0
        virtual/opengl
        x11-libs/libX11
        x11-libs/libXcomposite
        x11-libs/libXrender
        gstreamer? (
                dev-libs/glib:2
                >=media-libs/gstreamer-0.10.30:0.10
                >=media-libs/gst-plugins-base-0.10.30:0.10
        )
        libxml2? ( dev-libs/libxml2:2 )
        multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
        opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
        qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
        udev? ( virtual/udev )
        webp? ( media-libs/libwebp:0= )
        widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
        xslt? (
                libxml2? ( dev-libs/libxslt )
                !libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
        )
"
DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        dev-lang/ruby
        sys-devel/bison
        sys-devel/flex
"

pkg_setup() {
        python-any-r1_pkg_setup
        qt5-build_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' \
                Tools/qmake/mkspecs/features/features.prf || die
        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' \
                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' \
                Tools/qmake/mkspecs/features/features.prf || die
        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' \
                Source/QtWebKit.pro || die
        use xslt       || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
                Tools/qmake/mkspecs/features/features.prf || die

        # bug 458222
        sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die

        qt5-build_src_prepare
}




Reply via email to