Add proper support for HTML5 audio/video via USE=gstreamer (bug #368047). Remove phonon deps, it's nowhere used in QtWebKit. Remove dbus and kde USE flags, no longer needed.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 97 insertions, 15 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 7a3426555891..523bb4e834d9 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.131 2012/01/29 23:36:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.132 2012/02/24 19:02:42 pesa Exp $
+
+*qt-webkit-4.8.0-r1 (24 Feb 2012)
+
+  24 Feb 2012; Davide Pesavento <pesa@gentoo.org> +qt-webkit-4.8.0-r1.ebuild,
+  metadata.xml:
+  Add proper support for HTML5 audio/video via USE=gstreamer (bug #368047).
+  Remove phonon deps, it's nowhere used in QtWebKit. Remove dbus and kde USE
+  flags, no longer needed.
 
   29 Jan 2012; Joseph Jezak <josejx@gentoo.org> qt-webkit-4.7.4.ebuild:
   Marked ppc ppc64 stable for bug #390963.
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 0c64e5f6c66e..07fb38493727 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qt-webkit-4.5.3-cve-2010-0046-css-format-mem-corruption.patch 1538 RMD160 68a6f90191a40bc8e96d47954fc887179fe2533f SHA1 21fea858a629dc3b8dd9980a01450a78afccedec SHA256 8a483fc7211a4f0efbd800301114a3e7a463c750c0ad36356de1a37f0af188e0
 AUX qt-webkit-4.5.3-cve-2010-0049-freed-line-boxes-ltr-rtl.patch 1462 RMD160 c603c73c693d318ecee96f7a320e7175e497f2b0 SHA1 5b2ceae1f8207db5d4b991c4f26b1bc2ee503926 SHA256 f27df3afe3cdc4aa4d84ad9be2b0eba1114d8df89f8862f2d45c387e489029d6
@@ -22,13 +22,24 @@ EBUILD qt-webkit-4.6.3-r2.ebuild 1495 RMD160 3d26caa52863803b6641a03d0eb4229e5aa
 EBUILD qt-webkit-4.6.3.ebuild 1402 RMD160 bdc781c1073a100fe46532f4de77c93eb4357870 SHA1 e4330e7e9b66c25ac78e705d34f2c0c2bf5719d0 SHA256 74269a78728a2029c5b6b34a4ba9c4b3a4324bf0aa154733e4edf069ec2d0c27
 EBUILD qt-webkit-4.7.2.ebuild 1432 RMD160 1527244b7e58d0a2ad890c0a7e21602797d74251 SHA1 2a2d2e50e0b3edc419c93e3138a0121e4ed5bff4 SHA256 bb2bc83c40c2fddff5ba68c3a73169decc66052b1860fd4f30d415fb765135af
 EBUILD qt-webkit-4.7.4.ebuild 1434 RMD160 cbde9a9941e4e8e9ec0ac07b787ee39944063b7f SHA1 eb960db0749193aa99643db2920827dd4281c67d SHA256 7e4d9ad6bd55c204cebeecb4a961cca108d6b09afd23d3874fcbd2c540ef41c3
+EBUILD qt-webkit-4.8.0-r1.ebuild 1680 RMD160 89794770e715c30b75a2884100020abe4cdaebe3 SHA1 6a61c9110a3ea90d41b75f606114eb484c01d6f3 SHA256 7fe9c57fd10f693fad42a03cbda9556d4d218807b770def6035593ac3bfac443
 EBUILD qt-webkit-4.8.0.ebuild 1816 RMD160 21538331ee616d5c679a16a7217c781bcad8826b SHA1 8f9956845ad5be70b6ae29e97da9baa54a0b19b5 SHA256 441e936ffa4bc5788fd2125ba1f8ddb0d12469326a48984b7095dbae97003459
-MISC ChangeLog 18958 RMD160 3e162379ac445e05046dba17abf17921b9b88c25 SHA1 8884ba720765077204d3e8dfcf6d9e01b2af306d SHA256 f91047c9654218000bd860421fef2bbb76e7c9b4affa0d046b6193cd232ba85b
-MISC metadata.xml 612 RMD160 a806478b18f0175dac5848c2fedd3a288a8f40c8 SHA1 1d87f67f95a589f0201a7e96e066d26b8bd197fe SHA256 fad5152d3562d92a7feb45575d0d99c1be913685b4730208b767436447724217
+MISC ChangeLog 19266 RMD160 bd0eb18e83ec9e93b1d95201191be46db8c49a88 SHA1 1b14997a8dfc72206a5f1b72db9b7ccbaa795983 SHA256 2eb40012c72fd197759d9590220b25a1d3664097f0cd2c873fc336af45b1777b
+MISC metadata.xml 739 RMD160 dc601459869cc7369c2a5abfe7c5ec1f078d277a SHA1 0303b5284bc0d788074b1ba33cbfab768651dea4 SHA256 86ce6ed256d328d3471b43fdb45a97102ff3acbcd69b29a8b95fd1547c925722
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8l2AUACgkQcsIHjyDViGQjOgCeL1j7pCpVB7yQusDpmfanAMkS
-xvsAniDuOMxoj8SvNbHVE+x+I9pWoiA6
-=JafP
+iQIcBAEBCgAGBQJPR97ZAAoJENXLsxwXqFxy1P8P/iVwy1Hn8Oi2oJBU7CfzTfqb
+xJWMr06W2snYtM7NgYzNJ0j5mwMwDgNgrKewQzSYrCNkJABRjXx4Lm8DmQSw9VhK
+z6TDUqujFL0UnuDiVuy4TyuqOUOPD9mRklSFDGKfT/YSTRwTlmyVc+lSE6NRWXzV
+/yYC2WfjTacIfAloW9LkzhlQGW8DCrPAzN60orRwUSxWUiO9rWdBNNLztwzX49St
+0OJx5hmBlc7McC4Fcofsyzx4i1z2zhYQjckHdTFsFmhUOO7X+uN2wt2clI44eLVf
+3nlT3lsBXl/oG0zMXD1GLl2BP2elzxWoBZD284zC6tZFQ8U3QeeRvZLyJfIPeWWS
+7xtJJimTEEq1TFopDWDKIrJOK3IOCN9FJ0fmUCdYA1zhLFiD37KrB2Ko96iXbA/o
+kQvMsS1h/TO89UjmEuKURm8Ndgk/7KAyVCK1T8FceFQZ9KMbwh09wnPXcs1B1Pbk
+PvM4k97eaSXE9MInLiw+rycYBZY40JwypmvaJPZ8EDC0lK8tnxwNV09EDUd4hy/4
+llbwoIp2guxS5qljJSOxNCrcFDH3JKaAX5RKUtEp6cPxWe2f5BWRB6E216wMU/S7
+9Am5sCG5YCVHygvezL0SVIDDnQhxswul9SYngQuVnxtxmHo3kdusOoAXA7stVhkv
+Eg03cXWin7REj1Q9B0X7
+=R/3D
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 01b06e79c080..411cdaa0426b 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -3,13 +3,12 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name='exceptions'>Add support for exceptions - like catching them
+		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name='kde'>
-			Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
-		</flag>
-		<flag name="jit">Enables JIT for Javascript usage inside Qt</flag>
-		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
-		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde</flag>
+		<flag name="jit">Enable JavaScriptCore just-in-time compiler for faster JavaScript execution</flag>
+		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..54512b3c8ca1
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.1 2012/02/24 19:02:42 pesa Exp $
+
+EAPI="3"
+inherit qt4-build flag-o-matic toolchain-funcs
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+gstreamer +jit"
+
+DEPEND="
+	dev-db/sqlite:3
+	x11-libs/libXrender
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-c++0x-fix.patch" )
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/3rdparty/webkit/Source/JavaScriptCore
+		src/3rdparty/webkit/Source/WebCore
+		src/3rdparty/webkit/Source/WebKit/qt
+		tools/designer/src/plugins/qwebview"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools"
+
+	QCONFIG_ADD="webkit"
+	QCONFIG_DEFINE="QT_WEBKIT"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	use c++0x && append-cxxflags -fpermissive
+
+	sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \
+		src/3rdparty/webkit/Source/WebKit.pri || die
+
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		-webkit -system-sqlite
+		$(qt_use jit javascript-jit)
+		-DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0)
+		-DGST_DISABLE_DEPRECATED"
+
+	qt4-build_src_configure
+}