Version bump (bug 510042). Add multilib support (bug 498010).

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

3 files changed, 84 insertions, 4 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index f9c53c27cee0..2d3478cf307a 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.20 2014/10/22 17:39:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.21 2014/11/15 02:38:53 pesa Exp $
+
+*qtwebkit-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qtwebkit-4.8.6-r1.ebuild,
+  metadata.xml:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   22 Oct 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml,
   qtwebkit-5.3.2-r1.ebuild:
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 8de40a787be3..27734e40cd44 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,9 +5,8 @@
 	<use>
 		<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="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg>
-			instead of :1.0</flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></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>
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..4ed5ee414db3
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
@@ -0,0 +1,75 @@
+# 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-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="+gstreamer icu +jit"
+
+# libxml2[!icu?] is needed for bugs 407315 and 411091
+DEPEND="
+	>=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
+		>=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
+	)
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/3rdparty/webkit/Source/JavaScriptCore
+	src/3rdparty/webkit/Source/WebCore
+	src/3rdparty/webkit/Source/WebKit/qt"
+
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+src_prepare() {
+	# Fix version number in generated pkgconfig file, bug 406443
+	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
+	# Remove -Werror from CXXFLAGS
+	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
+		src/3rdparty/webkit/Source/WebKit.pri || die
+
+	if use icu; then
+		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+	fi
+
+	qt4-build-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-webkit
+		-system-sqlite
+		$(qt_use icu)
+		$(qt_use jit javascript-jit)
+		$(use gstreamer || echo -DENABLE_VIDEO=0)
+	)
+	qt4_multilib_src_configure
+}