Newer bison is needed due 'code' usage (#500454 by Dennis New), drop old

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

5 files changed, 15 insertions, 295 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index c9a19575eeb0..015707d9aa55 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.237 2014/02/04 08:37:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.238 2014/02/06 19:14:09 pacho Exp $
+
+  06 Feb 2014; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-2.2.2.ebuild,
+  webkit-gtk-2.2.4-r200.ebuild, webkit-gtk-2.2.4.ebuild:
+  Newer bison is needed due 'code' usage (#500454 by Dennis New), drop old
 
   04 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-2.2.4.ebuild,
   webkit-gtk-2.2.4-r200.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 509bacfa9489..d4d2f360dc75 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -40,22 +40,20 @@ AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40
 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.4.tar.xz 9849620 SHA256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f SHA512 d5fd825d01f700df8eb7d9021673a2a551cb6b4ba9e35ad0038e3d4e76322c0e751e1cd4cd7293a3388d58b8cc18169fec75044412a428c886376609d52fc3ce WHIRLPOOL ce42703d535b97e9e65bc05eacf462292ddf0434da3f056698fabaab007e53a5ded8c02a31ce9c289e22dcf73308daad4b3ca54ef1be7904035e2482abea6ce1
-DIST webkitgtk-2.2.2.tar.xz 9378852 SHA256 4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d SHA512 8098b69438cebc298796d4f1bdd5528bcf2e57102214caccc05256d9f393ae2d925dfdba8e7219f41791c094311f90beb80a957d648ca382df7a110272c0caab WHIRLPOOL 20db7d729eabe958faded0b92655eb1cbdb38803739bb3ec0edb5e3331c1ada26d9013c34d88c80e1e6cca68a8762b736812227f18f2530ae70c89d41800d111
 DIST webkitgtk-2.2.4.tar.xz 9393040 SHA256 5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74 SHA512 9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705 WHIRLPOOL 216f0ab3d51916e608d4e8e7c71a5c753a5a3e668bb9d095d42456d37dc43087551f569a864c5820fce1c7e6fccce215e07eded90b00d3ff8fde03215b3628d5
 EBUILD webkit-gtk-1.10.2-r300.ebuild 9921 SHA256 f8664f2eb6fd84564c957f396c4f45737b09087cea985326a85af733552d49ab SHA512 393176d3be9b65a98f0fcf1e93859fd1100e31b51e8f18372775df26da135d7842671a207265f378f4bf63d9b9befec004e3b49a7413ef5c0ac13573ccd8e783 WHIRLPOOL 79981e378222e028631327247b2586ac8375e3bfc5dbaadb1673ef8486e87a6d90fa2b0e20251b0e062964efd33c3cd877dc4fded112da02c8ce815b7ba142a4
 EBUILD webkit-gtk-1.8.3-r200.ebuild 9271 SHA256 32072f297bea63c07b26df8f27b7212dc972eacdd5ccad76c37b22c91e493aea SHA512 a1242d841ba1d67e069a78a1b0ffb6b137b54cd9be1cbfe206fd0f69ab771dcd5524ea993312b59f4681b88e5d43a82ef8571914c78ee61ca27220aea1ccd89c WHIRLPOOL 7f38e5b4524641298016d92c238d16b215d7a6baeeb10565358ac07a23429aa5a456941665ebc9231151c405a322571e0ef019db7c55630122ba53136f3c8de0
 EBUILD webkit-gtk-1.8.3-r201.ebuild 9610 SHA256 d624ff02d974fd706c4f0511182ca2227a550f10a936f4d5e003d64b4ef7b5f5 SHA512 0ee9bfd80d36d82487d9ad2789b3046fb0a1d34081c4905ab6cc661890b757b445edcfb1396cedeb5b6d79ec9f3835757f234c2abd43d37d78b992b671db9816 WHIRLPOOL f812239bb7803677acc4250d7f1e2517dc00669dd6d683af44225b4ac5b0b09934ce8c135a60481415215d1d2925beb30e1e988cc55d371fff1d2df7918883ca
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9759 SHA256 9404a95936f1c043a71dd94f6681dfeb4e194dcd5f474af0663c80faba4b6bd5 SHA512 a99bcd2462838a39db811839f1d16f1d163c8d6916a891419fdf6458eacb8073eef117e0a5e77f5ffcd322f8e7f7c8806f7e291eeb7f08c1ccd869b7efa346e1 WHIRLPOOL e78d3d3327e214f7c231ae1e54a81012608dde15f5faa0243f73d4cb0b84dd064feb73e496e0834e70ce52d1fcb252cd7cbc8dad074a4f0f96aa3e53ea699a4d
 EBUILD webkit-gtk-2.0.4.ebuild 9039 SHA256 296e9efaefad105ff350d7669d2c5baebd9fe796719238ee5a39646901198279 SHA512 3550522141269c643a86546e89ee12f8045033423219efad21ebf138144e296006735c6c1d6980c1bb74564a338dded14fea809490471895c060beac4dbe4720 WHIRLPOOL 14f043df57bfbf36664c06b77f80d7f2f69f36b8efb9f76fa18bfa93306c541f7c4799f2de34beaf60cdbe95540c844e4b3617bdd39176d14cc9f2a855aeea6c
-EBUILD webkit-gtk-2.2.2.ebuild 9172 SHA256 4b58cd0cde9ea281254b65f6e90418128b0e6cc71eeb395aadad46f0945c3279 SHA512 98cb031534a9615c82b5c4c2119f63a1819360dd5120bedba44dcd8308ad5951480f3041390184a1ab5812d144f5ed6d1b19e15a13b06f135185304813421767 WHIRLPOOL 108a8610387201a6efde0d1f776146742c1cc25045109bea41d1a0341041bedbd1334290bc6cfe1fe9c83aa4a5d34c19eb6d56e008f3912711bb731512b65190
-EBUILD webkit-gtk-2.2.4-r200.ebuild 9176 SHA256 34e139cbfedd7bf86b1cf44da9e14f97070db44d7b3e8891cc772896d11bc50d SHA512 ef2710b21b85043f2992646ba03c9a27f63585ca891a6835aa65c1912e2652e5a077e6c845ad2f2c9ee0ab846caf333ef7788ae4bb7a449703b1578ae3d93c68 WHIRLPOOL 3e7f36e409b103fbb672fa34d3b0e621470dcd798d9a678a895332b3bfb1421f8e52ef23076165ec2b082dfe887a22931d1b8c3ef43e29aa109a261d14dff111
-EBUILD webkit-gtk-2.2.4.ebuild 9272 SHA256 5e1c6aa55d6f305b6b7938fcdbc02e4bc648f697ffc8b9ee06fdbcead1271b75 SHA512 e1a1507b026801d858331a0a76519c27c43c8aad2796e3bfa306a10da35ae523e0b3c45ee102c577660fea478ab8e58152ec94ac506216810ca9971424e5e7a5 WHIRLPOOL 2e7112d803ebc086a02328e4b1b01b62ebcaaf86ae6c7aa1d83c2b40a0c0745397c1b21a2ad802a93eaa7f71024063a241669f041676a1c72b58d738ec5066dc
-MISC ChangeLog 48228 SHA256 423cc5e4ff6f355c36449ff2ea7eee6c4e70a29d9c9e9d7b6fd69713dc39f043 SHA512 87f25ccead5a245dc62634390212823c5ed958f4c5d0c8c611398a4b44ea04dde2a602fc809162ad8ff56fa3f7175ba871d62cb74d8f9ca61c3d942720b59cbb WHIRLPOOL eb6a1aafa39fa2df973d987d374a2890f51f236b9fe70a7512d19859de252bfab58bad88361b8e5afe552d28b8f4fa026edebaf33c8558a7cd2ef89d84f9b29c
+EBUILD webkit-gtk-2.2.4-r200.ebuild 9186 SHA256 b4384f56eff84dce1722997dd27886e44caaa25de8e4620812cd6b2c163947bf SHA512 2652d6ed67ebb32b1c9fc9addcd9bf2cf9e56bc5210983f29dc97aa752a37d19b793bfd48e912f9fc24cd70830dec03f8fa0a1725a5f671b51cef62b213b4953 WHIRLPOOL acc52f6f0ac9a646f809ddafe292f32d49988688e7558d9af1e9b3c618d0f7e01ac1f7bf7ba546631ef7b5c2e107f8a51d6c034f200d803c394ae633c32cd4ff
+EBUILD webkit-gtk-2.2.4.ebuild 9282 SHA256 3e608c60c5e7c96b721ec22cd69521a46cfb7b9354bb3b77907ccece01bbd2da SHA512 5524566ac38b1644d40356a90753fcd7cf56e8c2b36543e2816f72cecee212bb3bbbd0e273cc54af459e90d37de50ba723930cf8938e64bc88535b457f9c685e WHIRLPOOL 999e2fd94d74d8dba4d7de3a79a4f05deac63f61a9a3b2a47dc210f1a4f5ca22ae2416e1a1e3786cf13bc57cadfd12bf88945657ac9938d07c4bf3b35ebfa974
+MISC ChangeLog 48435 SHA256 1af0b99a01489922e19c27f01caa48245c049dbaf748d98ee61fe29fb82fdb42 SHA512 4e3d51fb9c15201362d0162b3ccade3caf811fdff5639b3bc8554442679c9f8fe110d8a0921a8dc774fdf6dc9668dc836cefe74da29a4d0dc62355bdfed50462 WHIRLPOOL 8ba2cf9bdeea2eeb5d56ff5660e590b5eaa32cbf2badf938efcfa6f4fdc9f4b5743dec3a305275a70787ca2b938cebfa93209c98b3a986c458b645dc764956d5
 MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLwpsAACgkQ1fmVwcYIWAYXqgCeJYL2MVk4SA4cloYI1dwNzvcs
-rG8An1qxWzfR4KihJ12BVefIUV9vztYH
-=8xbc
+iEYEAREIAAYFAlLz3wIACgkQCaWpQKGI+9R37QCffiPe6A7RtpVQs9Y1wYATVvhf
+CQwAn3SW+nPkdPhz1xaPm06Soekb0hiC
+=kyMv
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
deleted file mode 100644
index 3b842fa96a52..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ /dev/null
@@ -1,282 +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.2.2.ebuild,v 1.4 2014/01/21 22:42:01 eva Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils 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/29" # soname version
-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 +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	gles2? ( egl )
-"
-
-# 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:0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=media-libs/gstreamer-1.0.3:1.0
-		>=media-libs/gst-plugins-base-1.0.3: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_ruby19]
-		virtual/rubygems[ruby_targets_ruby18] )
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	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.0 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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# 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
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || 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
-
-	# 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\/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
-
-	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #????
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	fi
-	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# Do not build unittests unless requested
-	epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch
-
-	# bug #493654, upstream bug #125074
-	epatch "${FILESDIR}/${PN}-2.2.2-freetype-2.5.1.patch"
-
-	# 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, 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
-	append-ldflags "-Wl,--no-keep-memory"
-
-	local myconf=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	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
-	econf \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(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) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
-		${myconf}
-}
-
-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/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-3"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
index 701cfedd850c..de3386666258 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
@@ -1,6 +1,6 @@
 # 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.2.4-r200.ebuild,v 1.4 2014/02/04 08:37:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild,v 1.5 2014/02/06 19:14:09 pacho Exp $
 
 EAPI="5"
 
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
 		virtual/rubygems[ruby_targets_ruby18] )
 	>=dev-util/gtk-doc-am-1.10
 	dev-util/gperf
-	sys-devel/bison
+	>=sys-devel/bison-2.4.3
 	>=sys-devel/flex-2.5.33
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
 	sys-devel/gettext
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
index 088c4582bcb1..0082c4490fab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.4.ebuild,v 1.4 2014/02/04 08:37:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild,v 1.5 2014/02/06 19:14:09 pacho Exp $
 
 EAPI="5"
 
@@ -77,7 +77,7 @@ DEPEND="${RDEPEND}
 	>=app-accessibility/at-spi2-core-2.5.3
 	>=dev-util/gtk-doc-am-1.10
 	dev-util/gperf
-	sys-devel/bison
+	>=sys-devel/bison-2.4.3
 	>=sys-devel/flex-2.5.33
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
 	sys-devel/gettext