gir-nvidia-hangs.patch was not really working and, also, upstream supposedly fixed the bug in a different way also in 2.4.8 (not only 2.6.x)

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

6 files changed, 19 insertions, 649 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 81321adb5bc3..265609f55dca 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.308 2015/01/25 11:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.309 2015/01/25 11:59:10 pacho Exp $
+
+  25 Jan 2015; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-2.4.7-r200.ebuild,
+  -webkit-gtk-2.4.7.ebuild, webkit-gtk-2.4.8-r200.ebuild,
+  webkit-gtk-2.4.8.ebuild:
+  gir-nvidia-hangs.patch was not really working and, also, upstream supposedly
+  fixed the bug in a different way also in 2.4.8 (not only 2.6.x)
 
   25 Jan 2015; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-2.4.8-r200.ebuild,
   webkit-gtk-2.4.8.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5a55ce8cd4b1..702a7999a95f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -18,30 +18,17 @@ AUX webkit-gtk-2.6.0-atomic-ppc.patch 1630 SHA256 b5756d91c7bdd37ff13afe784c24ef
 AUX webkit-gtk-2.6.0-hppa-platform.patch 875 SHA256 b6ce48a290bccf9da2dc425c67003690e52e860d143f36b4eab11de1a81334f2 SHA512 c3f6873d26e926bd8beea0b98dbc499c40b724fce26343b0acff06513427f7a99ed6b339cf3d2ee8accd771949d67931f999dc47c801da8497ea59cab9052c6b WHIRLPOOL 7857cc28e075fc2fd3bcff31d64e7af481a214b120fcb9c9d03360f12e6d790544e45de6f7fe5d3888dcbea4c7f541b112e9430eb5438293511d881044e73e55
 AUX webkit-gtk-2.6.0-ia64-malloc.patch 1066 SHA256 0733f634b13bdd62828ded8b5cd6a32a0249a965d27ad9fac7d085b5d080309b SHA512 caacf20c8c9c418ff19ad312dde656d6ace1f44f2894e8ab37b8f2443f6313336a64cff86f63fbaa83bad123a6091ef79937c052dda862befee8671963b4a38a WHIRLPOOL 7752ee89be0ca64aa4c8dac0a2926a85ae5168dd71925bc08859b70bc4c1f74059c3334d34821c17fdd9cfb933957ecbb1eb419f80cc781e982e444c574dc569
 AUX webkit-gtk-2.6.0-ia64-platform.patch 637 SHA256 050218d8ab6076447ff7cfe2cebad4f4f3ad57b418bc3eeadb8d40d601877add SHA512 d8c5278a35ee3b163366919bfc31862163777af178a1054e86bd32580bad74251398bd3534203eb751770b30689c3c45f571377e93287946a2bba25e6e8a4d12 WHIRLPOOL c8f767aaeb040e0dbfcdc0dc378f43f6ba3bedaf9d53334bbe0393d7db59d14426e3d1a6eb865bb01ee53c571998b9bbd0ebeddca1b6668b815c1dad1d806b57
-DIST webkitgtk-2.4.7.tar.xz 9826208 SHA256 f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38 SHA512 1ba2371b34e40e078f6d85774e171f559e4f269ac80f63c56e2e7612e2ec3a41db0f5999af028b1b93657634fcdfcc3612e1a55eeeec2578fe448bd0861b0729 WHIRLPOOL 1cd8382e91efdce9d3654fe16de2f664b1f874ed7e9f811e5d652dd96e7269a48492f44ccbb1cd46e36d41b92188466b68a6e3e009e8dd037dce35ec9582f3d8
 DIST webkitgtk-2.4.8.tar.xz 9827632 SHA256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 SHA512 31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de WHIRLPOOL 851e3973c00096dd3a98e64bfa9f9f0f278c3513656af9a9aa72442cd6c594119adefafa6c06d05e431ec77bf6e9f1e10432e9b6895d777adfe2952843602ef2
 DIST webkitgtk-2.6.4.tar.xz 9996524 SHA256 beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b SHA512 242ab90ceff5b83978dd5bb8f0b8e05a7daa1fbbe87657ef0404facb17b873f3d703aed838f364bc042f2848b8cca300f1126f4d6979fed34235efa40e44d5d8 WHIRLPOOL 12f74b6e7188a92a2c5b656720e99937ac0c3f941ff83bdde5cf1cf671c61b8dc248d45a216dd1d821c684364bda0a43b38964efc3c0cb16ce2a1674963d95ee
-EBUILD webkit-gtk-2.4.7-r200.ebuild 10133 SHA256 fde5d7d92858ba39ba825b8b823a20a0bec1dc5fb27901dcb4d751b898c85e85 SHA512 f80fe4e2b5473464dc28017faa3cb9650e689ed40df956949ebf8f1bf0635e822c5f1428672f3ad9930301c89cd9564365cf04c04c428d17e367288e88ef5e19 WHIRLPOOL 30b8785b9032eda4956fbce8e9f03e2dfc2f9190498f8e0dd3c19e3f2642028795fc35ec6137d14d03088abfb2b6676716da32b1fb60d6bb10b96b4a65e9c433
-EBUILD webkit-gtk-2.4.7.ebuild 10590 SHA256 c5450aeecbfa249b057aa38c5bcb30a8f135ca5b8253f9bb4509b00af09dcbde SHA512 aa11935a9f6eb6cc383dce9d01e21ca3f18ebe020236269da69bd08484c189e71d9faa258b785474c6c097bdf227d142da5f1fe668e350a9bc6254e1120d0d93 WHIRLPOOL d566bfb866c11d0e1d0ce73176cb28ea3d74a6f3271cdd12791c6e1ed1dca5eda2175e53b3a45a17de0a6f43466b12ec54d0bcd806b8b16f26b96460e74bdb08
-EBUILD webkit-gtk-2.4.8-r200.ebuild 10068 SHA256 451c93ecd0f3731435d1777abaae2192df5eefa928691079a685d4f350af7c62 SHA512 08bea5992c61adb4ac07ece4d7d68d7d03b200fddfbe34e8255f9c8146a1e7eb665394bd17a80f87b02bc5f3283fc9902d9637880428ee952b37869654f0afbd WHIRLPOOL bd42bdbbdb3cbfcfc1ac210585d05c2b399a57ad2e465f13e7f7bc98665c51129ce9eff10fbfb514ca9ac9782b1b6bcdf169b6377c820bc246b6e1822e81d77c
-EBUILD webkit-gtk-2.4.8.ebuild 10525 SHA256 ce36ca9a6c5e7fbbf3a13e6c9ec5818092cf925c4d2d850ed0c064e5723a59d3 SHA512 2eaf957fed80d09d0829edf6ecd3fb2c1382bda372207e3065b974f7a7af326d11607f478796a799ec1bc1969ccfdf6009d11238723d5e25b982873fb976ee63 WHIRLPOOL 9f07c92424974df4749bc41fbc3f73f76727e38fc0f28ca1053393dfd18b10be8d52cad68e3f9b7d9c4a261545a1dc74db642624e75ff6b391e06604cbd4b373
+EBUILD webkit-gtk-2.4.8-r200.ebuild 10110 SHA256 2ac7b2c28f1cb4116caaabb1539309df50252a9ba9ea20744b7fb094433a87a8 SHA512 2a4b3b218b95ca47de1fbf0b709f477f3aca987e1ff9d6ec5dda24cc7df481ede73b0ab204b5e06a87f4f49a5de80c165d371fe448d9c5cd07e048fd31d4adda WHIRLPOOL 4eaf38a522b0801be13f95eb515a5263b11ea03124de7aa3951367c6a83728c084be479bd0b0075a2440bebf0d325c0629bb69d548f0ce3a2f03b62e33a82146
+EBUILD webkit-gtk-2.4.8.ebuild 10567 SHA256 df16a846bad0095714cb4764d7d8beac18ef07574c1a43d4fb20f7c81bc6d375 SHA512 b42add49629b9e33ee61f32f11d45e47998540089e5f6e1fc9331ef22dbabb7d11946f0a9fd7a50eb894ad2243e1ef71d2488dddb87bd1c557c414ded4a60f1b WHIRLPOOL 664db817f0f8a5ecf69d335220fcb84ca484a207be57a79b0b0ec98a929f92a04118f91e53c6f604d6cfef3a74ad19c62f4164e307a88f647f44702d79f48bb3
 EBUILD webkit-gtk-2.6.4.ebuild 6657 SHA256 8c5b33458648d660ba259929586fa4d3085f592b41a4575d0ec494f54a7dbf0f SHA512 10fd8057454623f7447c792baaedab8aef96a6883b26022820bdb0704003a1dab13d52a351109c2a6c46b23a52859fb7f415c50545905ec59686a769ce1c4776 WHIRLPOOL 42e0b38e15dabebc63b6fee2cd950f7fcbc2c1ae04dab72108fa93b3a01d56453731c119c6cec2c4ed9d58c8a48220fba37b11c35fa976be9b666055532c67b5
-MISC ChangeLog 64657 SHA256 28cca58944b32bda2f85bd1ed9b615e722a6cb7f0a71426ccaa0d32b9c1ee41d SHA512 44a41da6410a04c8d81ff33bd2f2b38046c9daac78ad78d4f320a1374835a2353786991bb72b8584ea1bee2ec49aa943541a99ab95447555eea298d27db8e0bf WHIRLPOOL e6171a477f98dbac20340f3153ce7756a03220c2f5c02cdefd62813e3ad04e3bdcb858286891bb7c104b001ab1e41da5447bf0bf5303c5ccc536b9f1a5367ebe
+MISC ChangeLog 64967 SHA256 8901399e9f333d4d126c9f2bcfbed1933f5c1135a4b21237668f2fa862d1ed4b SHA512 1992898e9b9bc3677a9634944375e1f47d2f25a252655e0da46c9cc999881a81f410df73da66d8e480d8570955a8f8ad290351e620b9dac1ec7aaca48e9f91ab WHIRLPOOL 6fa9c1b93e37eba8b3773c582b03bfdbafb489baf0ae29c742d9944eb58fc475242264ea767072f4f43a8345d4ba57dc90eed86f76c39eb958e65be3025072e3
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUxNALAAoJELp701BxlEWfFAgQALo6TO/kY1h7aGEAS5DDG4IF
-0zvuDpiCMr63js1GImabf2HuucjfrNM1mOU5/I2OpRXPeU1P5GOu25rkgg37TpIZ
-MJAahSWKj8UHyXCJGE+uemNqu9t1Z6cgTC+/f0KqmQnvx+mKgQh3/rrmM4acOtxf
-ev0A2T96Fm98Sw5E2zJoC3UXrK9YgK0AgkXrII1pAiCR/Gn5EZofdFJPP4g/7PuI
-c4elcWavdO2C2g9HZ/lNAZ1mXESpqUNnHOJ6JcMWuIzAvw27XSckbupZGl4N7avN
-bhtxNKz+LjlJcTYNewnRp7mb19hIyWriJ91AJmViRzco989sIO6wS+orGqnBW2X4
-GWXMrCWtCCw3Ly/AJm4cm5xH/jSjj0gzYJeGClEhQza8QvrStkk3K9nJgpxOGjqz
-zT7J/EZOTNbgyl1VUgbnTTB80/QjwvNcW4D7AHhGYsgHrvPtMc8sIAcdYKy+h0J7
-bM7bSLei9U5qG5ed7PLM7QrDq0/F6ProZePhCg1tPEVSQJ6/xRHJ9Tkl+o+9ImlH
-pjoH+RqGpTJSI7OGznc3X4ge3xRlr/0GcrpUyacgYTTmxUQGN46vj/gkzNoTgk/4
-ZQLEXYfICeZC/osk+bWYi1bWEJaY6Ji+EPZwifxDW7RVhHrYH71sEfysA8rQG4hW
-ShMrdFna2RzcqSnEGppS
-=Q+6V
+iEYEAREIAAYFAlTE2o8ACgkQCaWpQKGI+9R41wCfVFY4jQt6ior565faplf+u0ef
+HMQAn2gmJuyxcHiOEX/GPku4IA2PcYd+
+=tDwV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild
deleted file mode 100644
index e4dbb0d21bf8..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild,v 1.5 2014/12/22 21:30:49 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${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" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua X )
-"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libwebp:=
-	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.33
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	nvidia_check || die #463960
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	nvidia_check || die #463960
-
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; 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
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# Failing tests
-	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
-	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-		-i Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# FIXME: Needs updating, but probably unneeded in 2.4 as it has a
-	# "developer mode" for this
-	# Do not build unittests unless requested, upstream bug #128163
-#	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
-
-	# Deadlock causing infinite compilations with nvidia-drivers:
-	# https://bugs.gentoo.org/show_bug.cgi?id=463960
-	# http://osdyson.org/issues/161
-	# https://bugs.webkit.org/show_bug.cgi?id=125651
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	# Fix building with --disable-accelerated-compositing, bug #525072
-	# https://bugs.webkit.org/show_bug.cgi?id=137640
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It doesn't compile on alpha without this in LDFLAGS, bug #???
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local myconf=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable X x11-target) \
-		--with-gtk=2.0 \
-		--disable-webkit2 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${myconf}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# 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
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version 'x11-drivers/nvidia-drivers' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
-		eerror "used as the system OpenGL library. We are very sorry about that."
-		eerror "You should temporarily select Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror " and then run emerge again."
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild
deleted file mode 100644
index b1c668303c05..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild,v 1.5 2014/12/22 21:30:49 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${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="3/25" # soname version of libwebkit2gtk-3.0
-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 +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libwebp:=
-	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.33
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	nvidia_check || die #463960
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	nvidia_check || die #463960
-
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; 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
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# Failing tests
-	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
-	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-		-i Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# FIXME: Needs updating, but probably unneeded in 2.4 as it has a 
-	# "developer mode" for this
-	# Do not build unittests unless requested, upstream bug #128163
-#	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
-
-	# Deadlock causing infinite compilations with nvidia-drivers:
-	# https://bugs.gentoo.org/show_bug.cgi?id=463960
-	# http://osdyson.org/issues/161
-	# https://bugs.webkit.org/show_bug.cgi?id=125651
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	# Fix building with --disable-accelerated-compositing, bug #525072
-	# https://bugs.webkit.org/show_bug.cgi?id=137640
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It doesn't compile on alpha without this in LDFLAGS, bug #???
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local myconf=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${myconf}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version 'x11-drivers/nvidia-drivers' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
-		eerror "used as the system OpenGL library. We are very sorry about that."
-		eerror "You should temporarily select Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror " and then run emerge again."
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
index 1756384247ba..583d781d0daf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.4 2015/01/25 11:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.5 2015/01/25 11:59:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -164,7 +164,8 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=463960
 	# http://osdyson.org/issues/161
 	# https://bugs.webkit.org/show_bug.cgi?id=125651
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+#	FIXME: it doesn't really work for us
+#	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
index 164fa3f622a9..9e8ae4b354a5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.4 2015/01/25 11:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.5 2015/01/25 11:59:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -170,7 +170,8 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=463960
 	# http://osdyson.org/issues/161
 	# https://bugs.webkit.org/show_bug.cgi?id=125651
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+#	FIXME: it doesn't really work for us
+#	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540