Version bump, should reduce flickering with gtk+-3.4.

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

4 files changed, 454 insertions, 6 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 33fa1046eef7..ffec6e48c5a3 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.159 2012/04/29 16:12:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.160 2012/05/02 06:37:10 tetromino Exp $
+
+*webkit-gtk-1.8.1-r300 (02 May 2012)
+*webkit-gtk-1.8.1-r200 (02 May 2012)
+
+  02 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +webkit-gtk-1.8.1-r200.ebuild, +webkit-gtk-1.8.1-r300.ebuild:
+  Version bump, should reduce flickering with gtk+-3.4.
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> webkit-gtk-1.6.3-r200.ebuild:
   x86 stable, bug #410611
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a459fe8357bf..2196c1069733 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -21,6 +21,7 @@ AUX webkit-gtk-1.8.0-svgimagebuffer-clip.patch 6002 RMD160 8b758f798deeed43aa323
 AUX webkit-gtk-1.8.0-typedef-WebKitWebView.patch 1259 RMD160 3e70db419d0c814055760157c16bf056e2cdb890 SHA1 cd8af6b6cad2d925f467946cfa81ac2087690306 SHA256 7ea519b8212d752c3a794ec7f54b6222defc3c08d8a82b9a11bcea8875e783aa
 DIST webkit-1.6.3.tar.xz 6794004 RMD160 cc319ffe4c2810663ae05b90e69d9495f5c3f0aa SHA1 7df69608ef2ce9dd7328353b4ee34f69271cd43b SHA256 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3
 DIST webkit-1.8.0.tar.xz 7998384 RMD160 f1700350e3447f223e1cf900154adae86ba8a900 SHA1 75f1a7da9097c740c4aa2ccba9470229c0b5cf5c SHA256 8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc
+DIST webkit-1.8.1.tar.xz 7949924 RMD160 ebe10f63e2c514be13c7b61172b11c418d0ca0ff SHA1 d26543baace03c31aa3de82bc24f06f14c6b3052 SHA256 9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28
 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.6.1-r201.ebuild 4959 RMD160 efc7fe947fe751336e0038c866e842ff9b898180 SHA1 862ae335a359e32c933266b5c19dd6ea5cb1958c SHA256 c6869c581b6d7fc829c525f450c93dac9e89336b08f9394c8426892d99852896
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4895 RMD160 071c892951df0ea7a1e49edbffbc03bebb645496 SHA1 c07d104bb89fbc44ac86cdc76a89746169435875 SHA256 72cb6d8910e902f4222ab70967cf87a6ecac981c7e6d3d0a305d4a59cfee3f8d
@@ -28,12 +29,18 @@ EBUILD webkit-gtk-1.6.3-r200.ebuild 5299 RMD160 dd295ca333f75c5e2654d349ed0b9cb1
 EBUILD webkit-gtk-1.6.3-r300.ebuild 5127 RMD160 bb99a6db9ea4bff10165a2b4ac8ae4c74c8ce149 SHA1 7266f4a9bda9ccda16c5000f66d79101ede0aab8 SHA256 6bed17b44676895f674324d09b1c04ffa37b01d7635f9ec731ffae25cca855ba
 EBUILD webkit-gtk-1.8.0-r200.ebuild 6732 RMD160 48a99b86aa536f72791dc758fcf9c3fba60dbb9f SHA1 56cf1f4a6fff9642c6e66cbba74fdd2da5bb9cc8 SHA256 78a8a251fe152f05561d878ab363832b4d27f346c9e38584cbc84dba05fd3a1b
 EBUILD webkit-gtk-1.8.0-r300.ebuild 6844 RMD160 1d1a130118c7467b54a2b2e7623981d6c9420024 SHA1 3cb1937afae638efee36d11e97c4a3b101f1a2ee SHA256 b485b5fc332da2739974eab3f38b789e96b4ab662082975ce8380ee2bdef734d
-MISC ChangeLog 32085 RMD160 175e6895096a8d4fe9a0c5312b1a8eb436445701 SHA1 516a068e6765ab0c98a3cf4d0e101f455b90f038 SHA256 ce68ea98d40e9170d0554a0023da55c9937119b25129650f71b29283eb6d3b5a
+EBUILD webkit-gtk-1.8.1-r200.ebuild 6647 RMD160 d4897f7dd305657f395cf45dba679af69b06427f SHA1 7a707618b5d2f7acf58b0dd112534cb3865ff702 SHA256 9a52b3576de2946013acdecb6f81de2cc536d050335fb3b8b8ae1f1ba2567d89
+EBUILD webkit-gtk-1.8.1-r300.ebuild 6766 RMD160 072eda17cef4ca0cac2fb2cf4611f4b5d875a0c0 SHA1 672521c9302eba9d9976d2f7122fdcfbb2ceba48 SHA256 bf6deb4fc6bfbef4eda6c03935a4d5557128d7df661c39bd3abca5f5aa8a0f5e
+MISC ChangeLog 32343 RMD160 e7d21d47f0279fab53e971f7b531d4e3a3a455e6 SHA1 d0abff0e5606cf9cc18ec774d40c1bafb7dcbb43 SHA256 5f1bc25e607c9117077cd0db16eae3175e1394a4ffeb7e374e2fa911a14582b0
 MISC metadata.xml 759 RMD160 8f6fe7ef53ac0b8ebf648fa3dcff019d6c806775 SHA1 33b751cd3d5c948455a4117120487fdd5a40fd9f SHA256 7e95cf6779c2de81716bb42246e7669418e15954e67f50ff7904da251e48d3d2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+daTIACgkQkKaRLQcq0GKy5ACeNlbY5Nilx0pcDOkfDmVHPFwK
-J1YAnRpyqaaXVRIaTxmZ+A4dYCmZ3Fb4
-=vAg0
+iQEcBAEBAgAGBQJPoNYcAAoJEJ0WA1zPCt1hBpYH/1O6yhgLwvSc4uFoEU1QXDQZ
+GY1KXkFitH67RGMt2uRYa4WQWXjdbJHmvzT1E2qAhh5wTI2ff+kdce0XHDBKmAa1
+OOnho5WN9mXNJREx0as16tKMoJ80QTq8oA9p/5qUoh2NoRXIz2JYmcwWtX4lFimT
+fFbONaqMjPxz9CCqowlYz3GYB8k9395LkF5s31YqMQkCMZUOSJYCld+15jTQmdtA
+Qf259IGN0hBlQ27NyzGYSK19VZ65wsU5SHp46r9pHpb26e/5FhX6bjYK5MHxtqVC
+z3pGVuaLH0ueNqyRbWo6ohjQfkFu3kiXfA8ZcNM3CI7Xe8g1LRlSBV8hv8GxvT4=
+=oHqn
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild
new file mode 100644
index 000000000000..fb6411e7014a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 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.8.1-r200.ebuild,v 1.1 2012/05/02 06:37:10 tetromino Exp $
+
+EAPI="4"
+
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+#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 +geoloc +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.31.8:2
+	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.37.92:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.21
+	x11-libs/libXrender
+
+	geoloc? ( app-misc/geoclue )
+
+	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 )
+"
+# paxctl needed for bug #407085
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-devel/bison
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? ( x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+# Need real bison, not yacc
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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
+
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${PN}-1.8.0-svgimagebuffer-clip.patch"
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.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
+
+	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
+
+	# 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
+
+	# https://bugs.webkit.org/show_bug.cgi?id=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
+
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# testkeyevents is interactive
+	# mimehandling test sometimes fails under Xvfb (works fine manually)
+	# datasource test needs a network connection and intermittently fails with
+	#  icedtea-web
+	sed -e '/Programs\/unittests\/testwebinspector/ d' \
+		-e '/Programs\/unittests\/testkeyevents/ d' \
+		-e '/Programs\/unittests\/testmimehandling/ d' \
+		-e '/Programs\/unittests\/testwebdatasource/ d' \
+		-i Source/WebKit/gtk/GNUmakefile.am || die
+	# garbage collection test fails intermittently if icedtea-web is installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
+}
+
+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 "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
+	# 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 geoloc geolocation)
+		$(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
+		--enable-dependency-tracking
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	emake -j1 all-built-sources-local
+	emake all-ltlibraries-local
+	emake all-programs-local
+	use introspection && emake WebKit-1.0.gir
+	emake all-data-local
+	default
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
+		Programs/unittests/.libs/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 '{}' +
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
+
+	# File collisions with slot 3
+	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
+	rm -rf "${ED}usr/share/gtk-doc" || die
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild
new file mode 100644
index 000000000000..99143b691925
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2012 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.8.1-r300.ebuild,v 1.1 2012/05/02 06:37:10 tetromino Exp $
+
+EAPI="4"
+
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+#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 +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
+# 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.31.8:2
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.37.92:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.21
+	x11-libs/libXrender
+
+	geoloc? ( app-misc/geoclue )
+
+	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 )
+
+	webkit2? ( >=x11-libs/gtk+-2.13:2 )
+"
+# paxctl needed for bug #407085
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-devel/bison
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+	webkit2? ( app-accessibility/at-spi2-core )
+"
+# Need real bison, not yacc
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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
+
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${PN}-1.8.0-svgimagebuffer-clip.patch"
+
+	# webkit2 build failure with gcc-4.5, bug #412027
+	epatch "${FILESDIR}/${PN}-1.8.0-typedef-WebKitWebView.patch"
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.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
+
+	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
+
+	# 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
+
+	# https://bugs.webkit.org/show_bug.cgi?id=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
+
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# testkeyevents is interactive
+	# mimehandling test sometimes fails under Xvfb (works fine manually)
+	# datasource test needs a network connection and intermittently fails with
+	#  icedtea-web
+	sed -e '/Programs\/unittests\/testwebinspector/ d' \
+		-e '/Programs\/unittests\/testkeyevents/ d' \
+		-e '/Programs\/unittests\/testmimehandling/ d' \
+		-e '/Programs\/unittests\/testwebdatasource/ d' \
+		-i Source/WebKit/gtk/GNUmakefile.am || die
+	# garbage collection test fails intermittently if icedtea-web is installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
+}
+
+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 "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable doc gtk-doc)
+		$(use_enable geoloc geolocation)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		$(use_enable webkit2)
+		--enable-web-sockets
+		--with-gtk=3.0
+		--enable-dependency-tracking
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	emake -j1 all-built-sources-local
+	emake all-ltlibraries-local
+	emake all-programs-local
+	use introspection && emake WebKit-3.0.gir
+	emake all-data-local
+	default
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
+		Programs/unittests/.libs/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 '{}' +
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-3"
+}