Import Qt5 from qt overlay.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 103 insertions, 8 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index b486c50d3cd0..9cbff72acc8f 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2014/04/23 10:42:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.14 2014/09/11 01:47:10 pesa Exp $
+
+*qtwebkit-5.3.1-r3 (11 Sep 2014)
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org> +qtwebkit-5.3.1-r3.ebuild,
+  metadata.xml:
+  Import Qt5 from qt overlay.
 
   23 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> -qtwebkit-5.2.1.ebuild:
   Drop qt5 ebuild.
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index c06fc009a9eb..e5f95bf1368a 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,13 +6,14 @@
 		<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>
+		<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="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</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>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.1-r3.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.1-r3.ebuild
new file mode 100644
index 000000000000..6e88860a86dc
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.1-r3.ebuild
@@ -0,0 +1,88 @@
+# 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.3.1-r3.ebuild,v 1.1 2014/09/11 01:47:10 pesa Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: qttestlib, geolocation, orientation/sensors
+
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	>=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=] )
+	printsupport? ( >=dev-qt/qtprintsupport-${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
+"
+
+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 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' \
+		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
+}