Apply upstream patches to fix pkgconfig file and arches that use 64-bit double type, use gnome2_environment_reset, drop DEPRECATED flags (they were passed with USE debug), skip flacky tests after reporting failures to upstream.

Package-Manager: portage-2.1.10.38/cvs/Linux x86_64

6 files changed, 419 insertions, 5 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 6075601f775b..af40c5b95fd1 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.130 2011/11/05 13:21:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.131 2011/11/29 13:25:45 pacho Exp $
+
+*webkit-gtk-1.6.1-r301 (29 Nov 2011)
+*webkit-gtk-1.6.1-r201 (29 Nov 2011)
+
+  29 Nov 2011; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-1.6.1-double-conversion.patch,
+  +files/webkit-gtk-1.6.1-pkgconfig-fix.patch, +webkit-gtk-1.6.1-r201.ebuild,
+  +webkit-gtk-1.6.1-r301.ebuild:
+  Apply upstream patches to fix pkgconfig file and arches that use 64-bit double
+  type, use gnome2_environment_reset, drop DEPRECATED flags (they were passed
+  with USE debug), skip flacky tests after reporting failures to upstream.
 
   05 Nov 2011; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.2.7.ebuild,
   -webkit-gtk-1.4.2-r200.ebuild, -webkit-gtk-1.4.2-r300.ebuild,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index fdbae06fe8ae..b96ddbb9700f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,18 +7,22 @@ AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41
 AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
 AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105197a4abf SHA1 2748a46b1a4c9d547094ae2795ad2c812fbf59aa SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7
 AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034754e2522 SHA1 0481a4039c79414449262392758a63e97157ff93 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705
+AUX webkit-gtk-1.6.1-double-conversion.patch 1585 RMD160 2eb508cf95ce16f5a49e7375c46271d85d5280c6 SHA1 70b81cd3bb600fa698487b6fb59459ca24e31b6f SHA256 2b1baadaf694e96d546ae50ce2a4154e4d1f7efbe7566868297cee27e9c08f08
+AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44d28a6b80 SHA1 7d25b89803d208c7f0a7799659513ee8ff995966 SHA256 6380b001bf9077c2135453e3e45e947db2cbe9171fc2dcf9364bab1d25c13ac4
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760
 EBUILD webkit-gtk-1.6.1-r200.ebuild 4178 RMD160 5fe6f89c0ee09e69a43a81b9343b007643cd66e1 SHA1 463e74ebcadb4ccef80ec28a24e7f762510c3083 SHA256 ed401ed3a61f95e01e9970562eec6e5cf8784f97fc64baa68abfcce9a202a4fe
+EBUILD webkit-gtk-1.6.1-r201.ebuild 4861 RMD160 107fea07fbb0ca167c869c58dee55653a02a5864 SHA1 993be0a3c61904bfad929582f5a50e6bac5cd4f2 SHA256 7ee6a032edf1ba984a5348fab40522ec34330303dea80b0ba8e103706b79c389
 EBUILD webkit-gtk-1.6.1-r300.ebuild 4607 RMD160 4bbf1076fdf882bf3a65d1a25eec902d6a2b9476 SHA1 b29428a8e47d82823e76cd3a8fb1879444900938 SHA256 da1c4dde2a531631b146ce496f7a25dffb2dc756cdde24cd2676360ccfff2021
-MISC ChangeLog 25389 RMD160 7b14499185aafe81ebd556936b352d4238b8cfce SHA1 685d34f2162bf73ad9a7130e2215b8280920cbe5 SHA256 b260baf575bbb00cd4be72dc51101d372b045df45b59175419d45c3292fca398
+EBUILD webkit-gtk-1.6.1-r301.ebuild 4813 RMD160 0a51ff6bfc909d11c9c00915e88d5536128b372c SHA1 3749216e26eb4d47ce513fc321027161419eee34 SHA256 24d4e784ebeb1f392592fffaffbf193c92bb55f2b78f0152ca244faa0762cf9b
+MISC ChangeLog 25907 RMD160 6b61cc91a0eb494dfe1eb8d4fb41722bc9705f0e SHA1 920398c3152bd4415f163fcac6c6e5705d784b1f SHA256 9263a1b89be32871af50ca461ff2e78c65bf02ac8374eec40e4756a4baf7c3f7
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk61OFEACgkQCaWpQKGI+9TBNQCfXhxk5BxPGMBQhjWeV6P0Add0
-Z78An1bMkIjNyDSm5zaNDqtP+5k4+PFo
-=la6Y
+iEYEARECAAYFAk7U3WEACgkQCaWpQKGI+9Ti9wCcCO3AeaexA78oEw4aRpEr89t3
+nuUAn0QUIaNDoGIYMddmHeCiGCodidfm
+=fJ2T
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
new file mode 100644
index 000000000000..415fdfc3b2a5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
@@ -0,0 +1,36 @@
+From adad38e6096468a22f62a913cd4cc8fb95e698ec Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sun, 16 Oct 2011 00:54:05 +0000
+Subject: [PATCH] The s390 and s390x architectures both use 64-bit double type
+ that conforms to the IEEE-754 standard.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://bugs.webkit.org/show_bug.cgi?id=69940
+
+Patch by Dan Horák <dan@danny.cz> on 2011-10-15
+Reviewed by Gavin Barraclough.
+
+* wtf/dtoa/utils.h:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog        |   11 +++++++++++
+ Source/JavaScriptCore/wtf/dtoa/utils.h |    2 +-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
+===================================================================
+--- webkit-1.6.1.orig/Source/JavaScriptCore/wtf/dtoa/utils.h	2011-10-21 11:44:37.000000000 -0200
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h	2011-10-21 11:46:41.928885576 -0200
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch
new file mode 100644
index 000000000000..765dbe0f36ff
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch
@@ -0,0 +1,29 @@
+From 9adb931bd0899eaa53aa77a57a296b75ece8f0dc Mon Sep 17 00:00:00 2001
+From: "kov@webkit.org" <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Thu, 20 Oct 2011 15:00:16 +0000
+Subject: [PATCH] [GTK] webkitgtk's pkgconfig file needs to require
+ javascriptcoregtk
+ https://bugs.webkit.org/show_bug.cgi?id=70500
+
+Reviewed by Philippe Normand.
+
+* webkit.pc.in: add javascriptcoregtk to Requires
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/gtk/ChangeLog    |    9 +++++++++
+ Source/WebKit/gtk/webkit.pc.in |    2 +-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+Index: webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in
+===================================================================
+--- webkit-1.6.1.orig/Source/WebKit/gtk/webkit.pc.in	2011-10-23 20:36:14.000000000 -0200
++++ webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in	2011-10-23 20:38:06.180793290 -0200
+@@ -6,6 +6,6 @@
+ Name: WebKit
+ Description: Web content engine for GTK+
+ Version: @VERSION@
+-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
++Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
+ Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
+ Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
new file mode 100644
index 000000000000..a5aed44fa4f8
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx gnome2-utils
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+
+# Upstream is still shipping silly gzip files
+#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+
+IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
+
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	virtual/yacc
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# Fix arches that use 64-bit double type
+	# https://bugs.webkit.org/show_bug.cgi?id=69940
+	epatch "${FILESDIR}/${PN}-1.6.1-double-conversion.patch"
+
+	# pkgconfig file needs to require javascriptcoregtk
+	# https://bugs.webkit.org/show_bug.cgi?id=70500
+	epatch "${FILESDIR}/${PN}-1.6.1-pkgconfig-fix.patch"
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	# TODO: FAILS TO APPLY!
+	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	# TODO: FAILS TO APPLY!
+	#use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+	# Skip tests phase: here we will place tests we need to skip, any
+	# skipped test needs to have an upstream report and needs to be
+	# rechecked on every major bump.
+	#
+	# adjustments test is flacky, https://bugs.webkit.org/show_bug.cgi?id=68647
+	sed -i -e '/\/webkit\/webview\/adjustments/d' Source/WebKit/gtk/tests/testwebview.c || die
+	# the same for icon-uri one, https://bugs.webkit.org/show_bug.cgi?id=69228
+	sed -i -e '/\/webkit\/webview\/icon-uri/d' Source/WebKit/gtk/tests/testwebview.c || die
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
+
+	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# WebKit2 can only be built with gtk3
+	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--enable-web-sockets
+		--with-gtk=2.0
+		--disable-gtk-doc
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+
+	econf ${myconf}
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
new file mode 100644
index 000000000000..5311c0f78128
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx gnome2-utils
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+
+# Upstream is still shipping silly gzip files
+#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
+
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	virtual/yacc
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# Fix arches that use 64-bit double type
+	# https://bugs.webkit.org/show_bug.cgi?id=69940
+	epatch "${FILESDIR}/${PN}-1.6.1-double-conversion.patch"
+
+	# pkgconfig file needs to require javascriptcoregtk
+	# https://bugs.webkit.org/show_bug.cgi?id=70500
+	epatch "${FILESDIR}/${PN}-1.6.1-pkgconfig-fix.patch"
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	# TODO: FAILS TO APPLY!
+	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	# TODO: FAILS TO APPLY!
+	#use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
+
+	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: files for generating DerivedSources/WebKit2/* are missing, see
+	#      https://bugs.webkit.org/show_bug.cgi?id=66527
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable doc gtk-doc)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--enable-web-sockets
+		--with-gtk=3.0
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+
+	econf ${myconf}
+}
+
+src_compile() {
+	default
+
+	# ${PN} neither ships, nor builds documentation on its own
+	if use doc; then
+		emake -C "${S}/Source/WebKit/gtk/docs"
+	fi
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	# ${PN} doesn't install documentation on its own
+	if use doc; then
+		emake DESTDIR=${D} -C "${S}/Source/WebKit/gtk/docs" install
+	fi
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}