Fix spell checking, bug #447500 by Walther

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 286 insertions, 5 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 044867c1196f..a01831f14792 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.197 2013/04/10 21:58:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.198 2013/04/11 21:41:39 pacho Exp $
+
+*webkit-gtk-1.8.3-r201 (11 Apr 2013)
+
+  11 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-1.8.3-spellchecker.patch, +webkit-gtk-1.8.3-r201.ebuild:
+  Fix spell checking, bug #447500 by Walther
 
   10 Apr 2013; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.0.0.ebuild:
   use proper gcc dependency version (#465304 by Andrew John Hughes)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 69fb7e2488ad..7492a35e0106 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -27,20 +27,22 @@ AUX webkit-gtk-1.8.1-tests-xvfb.patch 1391 SHA256 9ba0bd2364b9c766921b2b4440d192
 AUX webkit-gtk-1.8.2-bison-2.6.patch 15829 SHA256 dcbb85c73be96841a69a1be5d01f9b110fa1f6cbc4ebd4e0c6a6470bca6627ef SHA512 a430a1286ad4e9a9ad33680c95e19408e99b2fade3cc5f8b45c6346c2f06316ec62a4736ad754ecec14ee410723d166a1cd4ccbe7cd0a89c6cf07f2a7b551183 WHIRLPOOL 2d41d72dc67da9927dabee09874c482b02691ede9b1e62ccad7a56d3ab6f8fd3ede94ee2393602e2d6b4b488e17a0dfa8eb1143cad956b7288652525efa19ae9
 AUX webkit-gtk-1.8.3-disable-backtrace-uclibc.patch 1007 SHA256 5f4f640991a1822f45f6a97c6aef016fdff411f8ee68b0dfea208cc5b9cc1ed5 SHA512 710da823e0506140239bc5890ce8a47a830ec1dd2ebf2134092e533e0f9041e400d680f65b3a45247a370443bc346b11bfcdea4873d6ddd569650495c724a276 WHIRLPOOL 5cc137dcdcfa858c02daf0be2389cf95a7fd7db88e92ba5e3d251092969c32cef95c0e98a1829fb2cd2ce715ce2b8d49c20602b80d0a71bf99ce1e1d08654c55
 AUX webkit-gtk-1.8.3-libdl.patch 874 SHA256 4cc477deb430915a60af6267e0400ea6210e9febea775d6d231aac6c408867b2 SHA512 87cfff6f72d73cf8ca2b9da3d59bef292f97688063bb9c6f8c8b3e0eb4ddfa0242300b5d35e5c6a41d75ee2a0f1e4a2e78a9fee6e702dac619401c8a92efaf99 WHIRLPOOL 1457c87606f9ace7067e93e43a6575e5ccb912ab1fe080f8c868ccbda252e293d24be20ed7e9bfc256cf10caa9441766f82cd4808688eb6ac4336ef646ab9b85
+AUX webkit-gtk-1.8.3-spellchecker.patch 792 SHA256 5c68f2c4052f660ab34476006f5fd600c6ba5427079ac83e08e787b7cbe6598c SHA512 a182a22b58aaa9e5efda5b23851d5c224370e03835ff76353f54fceabdb9dc2244c324cf0d3d5069ea8773e32008e671cdc7921846233397d7d9ec44fdf63118 WHIRLPOOL f7060b8c6aa88df85c583c65635a1a1845e1d0a0442d554a618d42759c13b4dbdb23dfb4dd18094915a42bfe8f90399ea84375b4ae6b3d94042947cb6367b0e0
 AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cbdc0785af2d2655a6cf6b1ff67072c SHA512 a7d3ab2a2065d18b16d5758c29d63543da1902f71dfb641e5b7d5db0a50c90b443026368b24b9f601d2f63f9eaaea67d3f686492d49068c2b013ad1cf6cf76a9 WHIRLPOOL 7808838f8d5389adb703dce234fa28e2da8266b57576fc70c37d11ea22af3b21a68f0e8600d237fbfc645a2796a7694e75c176035d57df75402f2adef690c4f8
 DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.0.tar.xz 9821336 SHA256 454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4 SHA512 bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5 WHIRLPOOL 02a83908f56c6b99ccb10049cbeaf5a5c4d05ca2f3e849a9a7fde9048a03f34db0feed00efcba8b30dfbc429873ec2f020b558c9e4eb29ce6e59d50d75225cf4
 EBUILD webkit-gtk-1.10.2-r300.ebuild 7966 SHA256 e5ca1bd482144dd73a8c587ec3517f3dd43a0df19569317a026c93f3e2c0081c SHA512 4718617df42e9a33629ae355bcbb3e932c4763162221a3e28a2515066b8fb72f6b7acf1ea76dbff685841b8ced0120b4ec5f9fd6cf563f3a1be14f20fae47749 WHIRLPOOL a6565e1f8976f404dcb1627a62480835bbc99660ed5a50023cd52a12c88c193e44e5cd4c46b7ff94ef19f865272af43f9933710bb802bd4384ac3bf26d8d8799
 EBUILD webkit-gtk-1.8.3-r200.ebuild 8565 SHA256 3b4c4fbfd9c39c52e799468c3577c6f7436bf780226536fcfa555dedc6c6b3ad SHA512 19f6c370c64d5f0c96c75d7095ab0eec08843615e6098188d32229d77ed33e325f0f2f30a113a332c98afa056ddafea5f7d8836a9ec056ff0e3f145b55fd7d65 WHIRLPOOL b4fc8b15950b8aa5910b375a73edec7409066a654aefda6744f6b9f2c83cd1eb6a89665ef01f232812ff2712d0f49f03d24d8cefa201fbbf7d2edbf691223c8a
+EBUILD webkit-gtk-1.8.3-r201.ebuild 8646 SHA256 5e3c23afd5e15ad7d71ba56315417104585f4e14c2370cb859e01e8325ea163c SHA512 cd0559eddfc7f7d961595cdffa26b574dea2179790cfcd9d288676c7371c46af452c8468b0cfb350fdb60268e0dd0e418b52e0abde5d2678c41d5b8093dcb09d WHIRLPOOL 0ba9f0b535c7c6bf497f66366f999cc9f17eedc2905465e6624ce7c67264ae26f13ec2264f3e959413e5cceee6bfb0a08f1ec8744021ced28af3da80f06b6b8b
 EBUILD webkit-gtk-1.8.3-r300.ebuild 8981 SHA256 5eb79284a24d39ea02ec7dff7ca3ab5cc294236f5f2081a762e8cef677b8f95c SHA512 eef010560195e1532f12721e0dd2f3abc32c6a3cf69960cebb917532cec1a917bc26865559965db8e21ad54bd011d7abb16d50920a71408a14b68666d92a07f7 WHIRLPOOL 824204597020337c4254c9ca9b6350b7afc8c4b11e6ad2143b8691ac12fdf6be516990c6a7ddc807b2906efb3774497af7f8eb3e9e7cafd2319dc1ed4d285989
 EBUILD webkit-gtk-2.0.0.ebuild 7943 SHA256 66cbe01a8cd8bb0e100e19bf5d23be88f5859a041b081bdd05557f1f30edcb63 SHA512 bead6bcb26876644378377e95ea1d13f84894754cbed6b33da5bbaf50b9cbacdc434eb7a11b9b748ac7e0616817465023c7267b01d366d1951cea4b30f652400 WHIRLPOOL 659c43d00d985e4ee762377a493bb42d1303f895f991a9ccb4ed2f2da9c43531daa2a848b66835cb2dcf0c49dbe0d9c7972405568f7e66d3d956898c3cc3cb66
-MISC ChangeLog 40005 SHA256 48b8b821a83e1302aa7295063e735a7618b74cf955eb5a2782defde458c46f52 SHA512 ed8c5bd6a6d035d222ad8885b36df4a5d2fbd7a21b228c29dd65dbad45a470904f352e8e7eb5ad63836fa8048957255e050b27fdc6f5643abb9bff537f937037 WHIRLPOOL 388314d1c679d0344b33ac9db85b7758d494980af80f348f77687a7ea40a9576dbeab91b982bce54eaeaf3463b01e8b01099a1c53a718447a5c65a2b38bb5920
+MISC ChangeLog 40212 SHA256 c837711590222d874f00f2f5331853dcc1589dc86206d525f826e922b3b8c651 SHA512 b4243b76bea0e9193401787174754071892ce00fcfda422d8303d860bfea2f271ab5692859b9ed2c61423f89742485af6e928b35b966489e81659e70f78636d7 WHIRLPOOL 21078a9ab58e2b51e75e17bd5de53462753f35d3eb79a5ec3cbfe3cb687d78f9150e13d00da08288b01ec3d514e33eeb4154fc4aaa4487aaebedf145f0765d93
 MISC metadata.xml 558 SHA256 18f1557aa99ae463f768111d8e2cdd1a9eb973dec36f2322b2c32aec98ee5efe SHA512 526ca4a587a80575bd14c39c0129712d5f7a50ca487a3518ca9e3ab7bb88bed5169e4695dd9a2bcafcc89af9788510a05ba043b5db537424ce450e988dc3ec54 WHIRLPOOL cf51ac43e0bbac4181b1e33bf10cf724a079dcfb735d6462cbb426b1247e1b9ae491edf46346723168f61ee9aa8afd02b70beea920c5a2d1d24b6fe967a2dcf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFl4H0ACgkQCaWpQKGI+9QMjQCePF5jwrtqdy5BFXajk0gD6RQr
-cY4AnjlsjuBMly7tM9Mwg3k3DlvYLeHG
-=CuBl
+iEYEAREIAAYFAlFnLhQACgkQCaWpQKGI+9TB2wCfVD4Nr6eWUU4h9CEw5jL3Ufz8
+aDAAnjrUuWSfF9qvVEPld+BbzVsLgLrU
+=lQgX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch
new file mode 100644
index 000000000000..5a6c8890b36e
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch
@@ -0,0 +1,12 @@
+diff -Naur webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+--- webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-12-16 14:58:49.658580218 +0100
++++ webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-12-16 14:59:05.546538356 +0100
+@@ -141,7 +141,7 @@
+ 
+             for (; dicts; dicts = dicts->next) {
+                 EnchantDict* dict = static_cast<EnchantDict*>(dicts->data);
+-                if (enchant_dict_check(dict, word.get(), wordLength)) {
++                if (enchant_dict_check(dict, word.get(), bytes)) {
+                     *misspellingLocation = start;
+                     *misspellingLength = wordLength;
+                 } else {
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
new file mode 100644
index 000000000000..4d62f783a78a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2013 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.3-r201.ebuild,v 1.1 2013/04/11 21:41:39 pacho Exp $
+
+EAPI=5
+
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools check-reqs 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"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
+# bugs 372493, 416331
+REQUIRED_USE="introspection? ( geoloc 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.32: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
+	virtual/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}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	# Check whether any of the debugging flags is enabled
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
+		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
+			replace-flags -ggdb -g
+			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
+			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
+			ewarn "large for current binutils releases (bug #432784) and has very"
+			ewarn "high temporary build space and memory requirements."
+			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
+			ewarn "WEBKIT_GTK_GGDB=yes"
+			ewarn "to your make.conf file."
+		fi
+		einfo "You need to have at least 18GB of temporary build space available"
+		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
+		einfo "not be enough, as the total space requirements depend on the flags"
+		einfo "(-ggdb vs -g1) and enabled features."
+		check-reqs_pkg_setup
+	fi
+	# 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
+
+	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
+	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
+
+	# bug #416057; in 1.9.x
+	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
+
+	# bug #428012; in 1.9.x
+	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
+
+	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
+	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
+
+	# uclibc fix, bug #441674
+	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.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"
+
+	# Bad utf8 data is being passed to enchant_dict_check, bug #447500
+	epatch "${FILESDIR}/${PN}-1.8.3-spellchecker.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
+	# webplugindatabase 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' \
+		-e '/Programs\/unittests\/testwebplugindatabase/ 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"
+
+	# occasional test failure due to additional Xvfb process spawned
+	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
+
+	# For >=sys-devel/automake-1.12 compability wrt #420591
+	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
+
+	# 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
+
+	prune_libtool_files
+
+	# 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
+}