Version bump for Gnome 3.10

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

12 files changed, 394 insertions, 42 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index f77b936d0268..57e7856273d1 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.67 2013/12/22 16:16:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.68 2013/12/24 17:28:47 pacho Exp $
+
+*glib-networking-2.38.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +glib-networking-2.38.2.ebuild,
+  -glib-networking-2.36.1.ebuild:
+  Version bump for Gnome 3.10
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org> glib-networking-2.36.2.ebuild:
   Stable for HPPA (bug #478252).
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 4d85ef4158e1..821d61ab7b02 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 DIST glib-networking-2.32.3.tar.xz 331996 SHA256 39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf SHA512 33e29a31b0c62c8413f40d2c562c3ec0580c374a16052d174ceb703ef0c9e91145953b4377547ae2184d60d24b01c1b7694b99c94221d8d0f16d5ef7ab21f72d WHIRLPOOL 3fbc3fdd0c800483d0cefe37511f8a61dc60526b5dcd68dbeea033d5c3229f8357af16a0c32389f7462ae6f97153597784fd59fcd3eeaced5fe6d9a2f9865c8d
 DIST glib-networking-2.34.2.tar.xz 346828 SHA256 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde SHA512 e9474e340c928adc67d777108a8cd0a001584fce433bcd27d2b52bb946bd341fade3a89b41e07759ef666d48eb3ed73bab87df0e37dfbaa71606f18b31fdee1b WHIRLPOOL 9e085df94075e11abaa0d79c34267add5221ce7c94597e58edf9ad3b3cd19dd25369e69ab0f67b43f54828433c75b3de0035d87d028895fd6ca5da5b9b252032
-DIST glib-networking-2.36.1.tar.xz 351892 SHA256 e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea SHA512 bd76f418b7d9ac77e82f63308e1a35e56d5a2bcdc7096f5ef122afda491914e893b2d7e75c2d85d40a75dce6218c7fadf7c8c5459ea8a2a68d2016275db5e09b WHIRLPOOL b3588a7dad70fd51b87d6ad1ba7d951068562649a4fd630eca9983698c1e5dda34ae2498a1e086102164b66eafea6ebc7de787a1986b6018b222f1cc4e441abf
 DIST glib-networking-2.36.2.tar.xz 352284 SHA256 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9 SHA512 077c8d821ff3942b7ddad51b4045a6a9aa05b50da58f5446ee2e536dbdffa81018141feea9e793da7b031a2991c6e4ccc66e524d288ab9e85603daa895283536 WHIRLPOOL 478e721db35a9c50bc32da71cb5ac55dd6b397544b147a1bda6b987f063f0dab615b536560169e145348dbc114363a85f4d20e487024c1f3f4075f3ce7526f8e
+DIST glib-networking-2.38.2.tar.xz 362524 SHA256 e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7 SHA512 299649fbb7df0821695b812e7d4f97ccfc8d63231fb3b9f6c8c1b0ea69d03bb1de80b1e6c7ca295837b210bca57620c9cbe2150fe1a36d9238604ad5d2412e33 WHIRLPOOL fb42e5e41245cae54ae32467896fb18d07e06e3ad2cc0bbfc00ec71c9ca8991dc277bceac43175bf5355284db1be7f5d6212abad59f29d2339af9bb1558e9897
 EBUILD glib-networking-2.32.3.ebuild 1879 SHA256 06920b6148c4b300d50d62cb35e848b319723844d2a9196cbe930c0479d26014 SHA512 7ebd5817c45b94cd8ccc63e2c54339bb5456aaeea573db63c6b8a6df5184f7a524c9b2f631c421107283fde0cc2e58f3e0deb0ce4caca91e24ba19856477b8c4 WHIRLPOOL 12bf8ccbaac62c1128e0e5d5c604f26607d3c02612e7a2ce9a7a6bc0684fd38cd6155ed1f0870d3da9af237436029f3e8cd97d4b5f79e2f9c1051b9f4051ecdf
 EBUILD glib-networking-2.34.2.ebuild 1695 SHA256 7b338d5e017cf1e809a1540f34237f6790c39cf44727e594281bcfbd6d0591d2 SHA512 7a07ef7e9a404c249dce34beef986c4fb0c9cc8a7d3e63bf72419a37f8bde31f7ff9a04130b1e697203c682dbe9ee25b5e17fef50515d19cab967580aa6fd9da WHIRLPOOL 1f584afe822b9722602b10925b73b9d41e6f168707d3bf471a70943d43360efd5e2f85c6904a8ca7423d689a2d64e7c8afe80568b33f46beb528821ab9a4c76b
-EBUILD glib-networking-2.36.1.ebuild 1723 SHA256 84c2fb9e374e6a410f407f29cc0e44ca92ba59bb1b0ffa884f56c9530dda47e6 SHA512 779247d1c776868df6240b52ad919ffa2096a84a552d937eec43f58f4613099495d55324d27ad7511d4ea6a224b681cf0e037e7aacf040255253a45e0f38d03b WHIRLPOOL 26e7ff77c29158cffda21c36b532cb4deb4956aee26ff46f1e482a93c915957cd3c60a6bc2a3986cb14342b9615ca63112ac20290e1d05e0a0de59ab5d6ea005
 EBUILD glib-networking-2.36.2.ebuild 1718 SHA256 2ff2c9930ef13c4433dc99106cd85f6d62637eb0e1b658151e8c955777ba9651 SHA512 2d9e6abb4f5a535eb70a4dee7afa215d331461444aa678d650b93884e0adbf7d3dbec965cde321de16eb29f9f013bddbe85bbc45ce02ecacbdf133f784f85f91 WHIRLPOOL faf3c8916a97a87e603ec08aebd07df2299e1a3268b27d546f1bf88616ba71d456f9245d08eb2bef1817e6cf20b3cb1ebf37e7b7b822accfae4418ada089c70e
-MISC ChangeLog 10483 SHA256 6e62fc1211a5f2cccad4c3e4b0ad045ea3a1d225f3d391c97b76ddcaa84cdb3a SHA512 601136f4ccbb745c2c7815222125a95d77fdb30d906d81be515d9467b37984b16917126af7a27c65c32f281cc876e2d883d60b45fe7e7e33cde4f0e25d1df3c8 WHIRLPOOL 9f01a93c31f0dec48e9c7de6a3b6a2e061794e14ff4a6b0dc300d23c234f5a2828c8ae82f113b49c0efe9547972d052ace5525d06227a1c78701f888dd3d32d5
+EBUILD glib-networking-2.38.2.ebuild 1410 SHA256 5e8593aafd2252bf4a34788164aed1fc770acf8a8ee3ee81f0ddec138b6e2852 SHA512 b3f5ec819ad74255770e03b5187877336c2cead62344f60ff3f527011817445ba668673564f540c88b2cda5c4d1af1e80f8145df59484f40602bada53a334fac WHIRLPOOL 7981332f8aa90ad1499b4a22425c59caa170a04ddee86b935fa10e8e64d0f32acb88d34892de09b36fe5f9cbd961dd0411a37d6b10fb644ce77cbdef8f8865fa
+MISC ChangeLog 10667 SHA256 46655a85d06b55426addf109b5bf28934c2f6656d31d2d0380334e3250cb41fb SHA512 4ed61c207ef5abf26e1b09f0a963af6cbc0563cb9ebefcbfe5f19db7ae5c86fc3a42ed1915456ebac1d21b530bfc020c7ffc1a3d12a43013c3a61e19a0bc9807 WHIRLPOOL 62d802b273e7d962f622f4995fd0891014e0123cb9901811a714298ee5f8cdcd2e69ac5daa8fd0f0e95b93f2878de768703b82cce1f695eae1d64c0bb64d8f87
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3EG8ACgkQVWmRsqeSphN6jQCdG1R4OK7+Nq3lRKzBLqrxIm1i
-mT0An3cTwpflvfFvgKhgzIYMzZm6FNd8
-=ZLue
+iEYEAREIAAYFAlK5xFAACgkQCaWpQKGI+9RbRQCcCrn53Jpv6wOIiC1Kq0nJc6kk
+egsAnRAD2xOGdrv1IQxBsQ3OHQxNtVco
+=rAqt
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/glib-networking-2.36.1.ebuild b/net-libs/glib-networking/glib-networking-2.38.2.ebuild
index 5fe398dc8b94..7bd75063c192 100644
--- a/net-libs/glib-networking/glib-networking-2.36.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.38.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.36.1.ebuild,v 1.1 2013/04/23 19:10:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.38.2.ebuild,v 1.1 2013/12/24 17:28:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE="+gnome +libproxy smartcard +ssl test"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
-	>=dev-libs/glib-2.35.8:2
+	>=dev-libs/glib-2.38:2
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
 	smartcard? (
@@ -25,7 +25,7 @@ RDEPEND="
 		>=net-libs/gnutls-2.12.8:=[pkcs11] )
 	ssl? (
 		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0:= )
+		>=net-libs/gnutls-2.12.8:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
@@ -35,17 +35,7 @@ DEPEND="${RDEPEND}
 "
 # eautoreconf needs >=sys-devel/autoconf-2.65:2.5
 
-src_prepare() {
-	# Failing tests, upstream #695062 (will be fixed in 2.38)
-	sed -e '/tls.connection.simultaneous-async-rehandshake/,+1 d' \
-		-e '/tls.connection.simultaneous-sync-rehandshake/,+1 d' \
-		-i tls/tests/connection.c || die
-	gnome2_src_prepare
-}
-
 src_configure() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
 	gnome2_src_configure \
 		--disable-static \
 		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
diff --git a/net-libs/gnome-online-accounts/ChangeLog b/net-libs/gnome-online-accounts/ChangeLog
index ea84b8649745..f17e0c8b29fa 100644
--- a/net-libs/gnome-online-accounts/ChangeLog
+++ b/net-libs/gnome-online-accounts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gnome-online-accounts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.27 2013/12/08 19:22:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.28 2013/12/24 17:33:07 pacho Exp $
+
+*gnome-online-accounts-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-online-accounts-3.10.2.ebuild, -gnome-online-accounts-3.8.4.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   gnome-online-accounts-3.8.5.ebuild:
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 381364b4ab31..7af70faf9e53 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-online-accounts-3.8.4.1.tar.xz 648012 SHA256 7f74fb776c322a16c108ee4061eec5e98e17e4fb11577c894fb0cb550462d157 SHA512 fed1ce1fc874e63f87232869d116d96015c57c8af691719a8d70c0c9c22ab5306142a13ae1e0b56264917c082c92a17590b985a3277504965314d3709e376bc0 WHIRLPOOL 584ce7991d24d7efe6fd7ca3f87e1ce73f3a87844241070cb1922833a4f44fbd1f73ae643202e70029853aca0cc6f43acecb9acd30c4fb7807901f50503f6ca1
+DIST gnome-online-accounts-3.10.2.tar.xz 1267216 SHA256 0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97 SHA512 1a6a63dbeff8188062454fbda6a6009f7657041ef0264cd5c89af01ab7c965d3ae66a7b336a9e3dc9051acf67c075430802cbc64946b770048c9488b4835c151 WHIRLPOOL e558a402aba11a2cc57ff31762d1d4909ae6e17605cca92c65b7a65f26ae7492f3b08c929be66f6833ff6d29a8717264cbd2992f648901ce6f02ac7f6047c6f1
 DIST gnome-online-accounts-3.8.5.tar.xz 648396 SHA256 34d6fbc33bda4c7bba8aa52343ebe1eb8afe1033097c10a2d9979c0a99593e5d SHA512 b5af8c2e83e3287954c15b3b42ef9eebbbcb245534e45375f1e80c0309b064f81740d94ea4fb5b510863383e8c21f394fc6ec77523b4ef63566bfc15742f0b1c WHIRLPOOL cbcd43d36a15b5e9adc0d4284f4ee4c5a6291efe47e7a268f3f66024ca752af71edb5dc558014f683dd10ed36f54232bad7d43473936b5f80361e4defebf8d52
-EBUILD gnome-online-accounts-3.8.4.1.ebuild 1660 SHA256 6eacf18f1157304378c829c7e4effe64f25b63366da7ee5416fa33f4f421ef2d SHA512 474e13c385d9e30eeb8a64929af4754edbfdda5f92d023fd371113c2d9a47959c9fbe9eed061551136b7ca919813aeddfee9d27623dbd27b5920b6e367f3979d WHIRLPOOL 7d1bfa9f187f20343dcbc63ade9e27d371cf532bd44ecc998226abb84bd9c128b6abfd1b5a46c55fa29003f6c389207ee187e616097868096c8c761f044e9066
+EBUILD gnome-online-accounts-3.10.2.ebuild 1983 SHA256 79986c1ac10647ec32e5ee056edb3ee1fac0198b6eb284251fffc19c5ed02a20 SHA512 cf1b3a6f12352200144479ee24e4131daeabe1292f1daff048e4c6d33ffbbb71d136712f2e0bd41004eb6b8801af1179702ab38e1f1e30bb79ca780cbcab0a92 WHIRLPOOL 8c13bf8b1706e3f10e67d4b22c7dae2bc80852fc9e82d807dee8e8e4c5a7af0aafc616f963db4135ceb1ce53b3c0b8424736245ab5264641e43d411b1eff754d
 EBUILD gnome-online-accounts-3.8.5.ebuild 1675 SHA256 ddcbfb173f1da6b49256d09387c560244b7b8b1a9dfd42465772b6d9dd388688 SHA512 3201688ab4f199c5ababbf70b009bc97f19323216ada97d22136d9a993b1e00a519ad589c3138fd7aa91a8446da79dbfca28e8f4af9edae242849bd6ec22572e WHIRLPOOL d70f54b5eb44e9759d837718439231ea165a102bdcef85ae8384308fad314da60283c426a007fcd0b7681b7382f6766bad35cab8816253f38ad4f560dd022079
-MISC ChangeLog 5415 SHA256 d62c7ce45081202b493188caf3c204dd1aca486bb525d897edd907142aeef1d1 SHA512 b5aae171c07d1fd793be01fef1a5ebca84dc24274e66bc667408cef4e8dc6c3d748d452401426528f2774fc4560f1392fb22c74ba34e4f9f7be516201b599b4e WHIRLPOOL c7a53fb6dfbb147eefbc31e30733017d5aea1a9eaba949d42face87bf8c4bfd17b50072dbc40ce87e4f1012ac777ba900859a075f207efcd80d00925841430ec
-MISC metadata.xml 288 SHA256 7d53248d2d185ee6ff67ac7c464c575b98329974674d742a7bd34f479a302c06 SHA512 f144535c9d708b47f5a8f3c00765728d73949d0f45a0fd6101158024499c7d1cccc40a3992dca1d4512c7fe0a895ffd9d47e8e982347fd82c4c564073f47eb17 WHIRLPOOL 82bf76f0942643dcfe8152b0a12e8ef74a0d1fbf16b1a983a7a0768cc97f766aaef6be86e938b4fd30f14144c14260ba05fc95baec3300f27f2f5d7f1a0595cf
+MISC ChangeLog 5632 SHA256 b8fac8f60c4001581321cb0c967237cfb83b12666a83e6e6691507235dae1ee8 SHA512 f8d0b7e47acb7bb2fee271ebb54ddb983f8f3e347bd82fc02a19a5c9c3935c4d15def60e79df609431731e994dd30872f4e713e2297d3e747d53df552d2fe3e0 WHIRLPOOL 48a0ab80631c169fd9e19a7a5b8e37e270ff9b65cdbe9b94a0da999af35111d02b1757f147af09665d2876f24132431c247b5cd9366bc8372beb4d8077a540d4
+MISC metadata.xml 373 SHA256 52130cd03f0b15a458ca5f8603d540ef6fbe91ab6b19d14cacfd94361a60db76 SHA512 2a1f568713771fb3b799cdb921e1c33b14c37fc9b23cef1d329bc47188352504fc79da08194eb15d7d815b1a67f41f8c40ecbf6e5f4fdcd8a332155ff0837f4b WHIRLPOOL 1d161c39928c78b4eef5c2190f4b9e4186fe4e7281c5102906896b435bb82c95670482a98a07adfe1d819f82f70a7c103ae8fac488c91bacecbff22b0d3d980b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkxugACgkQCaWpQKGI+9QRCgCfSS+Uvzt/vwhDD6wiL4KN9YwL
-VcwAoIYOCNcmb4gDJCazfHOt9v/+Z9+X
-=+ESz
+iEYEAREIAAYFAlK5xVQACgkQCaWpQKGI+9RrnwCeJn+qLFNnSvlNnnMWJ73QcEKG
+5gkAn398NRDQc+r/DmKpO3FwrrPqAgxx
+=XeEg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild
index 987d6c6029e2..8431fae81b6b 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild,v 1.1 2013/10/10 18:50:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild,v 1.1 2013/12/24 17:33:07 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="yes"
+
 inherit gnome2
 
 DESCRIPTION="GNOME framework for accessing online accounts"
 HOMEPAGE="https://wiki.gnome.org/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="gnome +introspection kerberos"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos telepathy"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # pango used in goaeditablelabel
@@ -20,18 +22,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # json-glib-0.16 needed for bug #485092
 RDEPEND="
 	>=dev-libs/glib-2.35:2
-	app-crypt/libsecret
+	>=app-crypt/libsecret-0.5
 	>=dev-libs/json-glib-0.16
 	dev-libs/libxml2:2
 	>=net-libs/libsoup-2.42:2.4
 	net-libs/rest:0.7
-	net-libs/webkit-gtk:3
+	>=net-libs/webkit-gtk-2.1.90:3
 	>=x11-libs/gtk+-3.5.1:3
 	x11-libs/pango
+
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	kerberos? (
 		app-crypt/gcr:0=
 		app-crypt/mit-krb5 )
+	telepathy? ( net-libs/telepathy-glib )
 "
 # goa-daemon can launch gnome-control-center
 PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
@@ -40,11 +44,14 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.3
 	>=dev-util/gdbus-codegen-2.30.0
-	dev-util/intltool
+	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
 src_configure() {
 	# TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
 	gnome2_src_configure \
@@ -53,7 +60,12 @@ src_configure() {
 		--enable-exchange \
 		--enable-facebook \
 		--enable-flickr \
+		--enable-twitter \
+		--enable-yahoo \
 		--enable-imap-smtp \
 		--enable-owncloud \
-		$(use_enable kerberos)
+		$(use_enable kerberos) \
+		$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
 }
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index 998061301bdc..ea808a92ebe1 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -5,5 +5,7 @@
 <use>
 	<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
 		to set GNOME online accounts preferences</flag>
+	<flag name="telepathy">Provide widget to configure the telepathy
+		frawework</flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index c8ab1cfcee33..2ce5690777ba 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.227 2013/12/08 19:28:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.228 2013/12/24 17:32:26 pacho Exp $
+
+*webkit-gtk-2.2.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-2.2.2-unittests-build.patch, +webkit-gtk-2.2.2.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.0.4.ebuild:
   x86 stable, bug #478252
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 16a1291afa60..43f19111383e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -32,20 +32,23 @@ AUX webkit-gtk-1.8.3-libdl.patch 874 SHA256 4cc477deb430915a60af6267e0400ea6210e
 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
 AUX webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 1374 SHA256 2a1b197842fc36607e68cf35fa222eaaf780064cb17bd40cf318ab1f3693f40f SHA512 eeddbc8cf51727b6f69c06f215a58b73704a626f8c0dd05370bda988409ad8b161a6393baafa9af65fd3ef961f9c559280af7626c41f5689684bba79a8570083 WHIRLPOOL 884b5bb0c483fe78bf73ac5a429953a9b084700068bfd923a86150c03ebe4bbd5cf6101c60654f82da19a5f28c617df5d8221e726a254ff250494c30e954d022
+AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
 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
 EBUILD webkit-gtk-1.10.2-r300.ebuild 9922 SHA256 40301643bb88e2bbfd57cb2605a0d98d1435d81a84729c16b824252a51dfc18e SHA512 3c3c4a9efa40745baf2c99a2a1ca6bab9036f077c5295137699354a872a92345a2c0a60c1dd24a04f47961823e80a774be7bfca66dcb27600d4225d1d6fa3943 WHIRLPOOL 033d118d560e9f09a0d8fe82425ced10517803f40e899605586f7fb1ca2e3265b7d8d8961b976bcb9f87b67f180e52d69af91b346679f9e278096cc598293aae
 EBUILD webkit-gtk-1.8.3-r200.ebuild 9275 SHA256 3ca7b77c9f7f8c0f88cd57832862c75c595c6b8995b2089df621220f0f6fd98e SHA512 e682084e3ef39235e40ebd92f5224efb929334f6611f5be0d63ad946d7ab05fa883fe6df0ee49591a712665e361c8bc81fdcb0877314696f6392fc1a410e7f29 WHIRLPOOL 635d450b496239692d612b2fd544d6d53b352ec80b8f9c2eefdf8429cc1fa20643f5dab0fa69c4c90f9953e864b3e2e6054cf11147e1c71222ba9482f88be197
 EBUILD webkit-gtk-1.8.3-r201.ebuild 9540 SHA256 9685baff5621edf1daced901d18b3d178dfddc96a0287716c84872d21cee666b SHA512 b66ac497818db4f188eab0f9ba8f1a5031eaf11b9eb4707242824877d3e11b3a23ec1963d1fda9158cb21e1c77622fbbc56a246985f61afe85d4dcf0ac516b45 WHIRLPOOL 5fdca010c1944d33145297f154d96cf169acaf5312f124453092fae801c9565a7a9f49099e9f58e9bbd39c9d95c75349b84dfabe86b1a8823c88e79581f80d85
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9689 SHA256 c5b6bf22e46f829973bd98b8ffad7784b7137e92f0dbe49e0d31bfe31aaa640c SHA512 619bb2280ef72ab12be4ea469daa99b3a29989c6b14056790b19eae43425b1bb2d674a9b05d64f969fcfc5ab5ec41dc0521af1903cf96e7b73b1061da4de7411 WHIRLPOOL e1cb0a9209c3aab5b3c2924e7703914af64ee4ecbcb094d1d7bdcbd5185cab16074a0645bb4fbdb6c3baa9703c68d19c8e4e3f9c458c7ebbf5d8b417adb03af8
 EBUILD webkit-gtk-2.0.4.ebuild 8929 SHA256 bcb9dc5d46b65859a22348d2258829e9d511f0d7089cff19e2397848f1f76f04 SHA512 e38348c733feaf31c56148f27773c97ab6f37da67cadbdf523e35ed65b9bf3e41b2aa3e07138068b328e564967a2d63f46465776c5beeb0f1d4eb793453f92fc WHIRLPOOL 4c0862bde5accf889063b0ce6a5ddd4230c1d507636f2ef27d406f675d6a0d4190d4ec7564d80390aa85db05be33731c5e6419961173d9c41171e8691104b00d
-MISC ChangeLog 45690 SHA256 a5d36645da88a85d0ec844eef4f18a7fd06f0e7c4485071077db4feba1837f52 SHA512 4cac828d0950c8f212181bdf065c222852f8137c0caae39c19e3884a599925bae45d63b609b19de9dc9ee68e97665f8276fcc686479644c9160a69a24422e4a9 WHIRLPOOL 5a39cb38dd9898e68528058fa78a67e3f99174f055c4a986ec7f9dfc343db870bebc1720886c0a5928a6ea0a5449ad67fa16dd8d69449b76cc71130184fbabe8
-MISC metadata.xml 633 SHA256 99b9115b4d9711d65a7fd50cc777c4b8b49147104bfa23a23a46eb478742d338 SHA512 bf0a77250072f9c44a142030574cdb223de5f17c0fe168c1e848065043daddcb9e38eaddd8bd85dfa925bfd22cf37386a1532c4fe272a1aea4d22d5e46981510 WHIRLPOOL 8bdb0cc7b4659e177ceedca853cdc5b5bec4daa4d9144d32410ba584cbfa6ee2dd09a75211c5ea3f1ea2f5c180e10b3cf6e3e8583c0a14bd2095c604fbbc4b60
+EBUILD webkit-gtk-2.2.2.ebuild 9063 SHA256 f15f4520949646bf1dd87fd07c042d40d73cd335c358bb7645dbe7064dd2e13f SHA512 8c522c0cc33737d5ee2c3486432b83fee3d42d2ba73942770cfca01398d4f9a7b28f0a3bdd5e2a6b0100a8feb17ee0137e86d2f689ba1ce9fb19e9644ea601d0 WHIRLPOOL dbb602207396acb29c3b547b4f5ac7bde6fc767e2aad8667d7c2303a76ccaddcaf4ffaedb87a73eb18484dca3d773d8ae21040e74b7f3315cb7bf01c695cc376
+MISC ChangeLog 45891 SHA256 3a76b70a32ab823a3822a103bcda833bb6a0cfc054dc237100000eee80656466 SHA512 3e128510688e6d90814c75bb06e220a6de6e944f08b5b37ece9b869c90ae21e391a2f5a36020a9a50539dbcbec70be7297d2906183b7f2f84ff4628937d45f83 WHIRLPOOL a112fd19e23c6b8d59875f55f7aa6e0dd1e52d9bab28798f02689c5ab63e2de2d3113c4c4c0095e0244d148c79b94dcbb89c7de8676c21973d40067bd282bc1f
+MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkyF0ACgkQCaWpQKGI+9QUrwCeOZlmS5OoRCegve9DJK16+JYZ
-ZvgAoIJxVVIbCE5b48Hc/RF3cqHGp5rS
-=l4s/
+iEYEAREIAAYFAlK5xSsACgkQCaWpQKGI+9TwdQCfYt1iAOYOpUYNRZcruZLIOZnj
+09EAni49snRG01/IjQb4vksoNZZpPyGT
+=8bAW
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch
new file mode 100644
index 000000000000..14fa30f33d6a
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch
@@ -0,0 +1,45 @@
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 27 Nov 2013 23:36:41 +0100
+Subject: [PATCH] Build unittests on demand
+
+--- a/GNUmakefile.am	2013-11-27 23:52:56.148735433 +0100
++++ b/GNUmakefile.am	2013-11-27 23:51:25.551590806 +0100
+@@ -51,6 +51,7 @@
+ # Libraries and support components
+ bin_PROGRAMS :=
+ noinst_PROGRAMS :=
++check_PROGRAMS :=
+ libexec_PROGRAMS :=
+ noinst_DATA :=
+ noinst_HEADERS :=
+--- a/Source/WebKit/gtk/GNUmakefile.am
++++ b/Source/WebKit/gtk/GNUmakefile.am
+@@ -446,7 +446,7 @@ webkit_tests_ldflags = \
+ 	-no-fast-install
+ 
+ if ENABLE_WEBKIT1
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ 	Programs/unittests/testapplicationcache \
+ 	Programs/unittests/testcontextmenu \
+ 	Programs/unittests/testdomdocument \
+--- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
++++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+@@ -25,12 +25,12 @@ TEST_PROGS += \
+ 	Programs/WebKit2APITests/TestWebKitWebViewGroup \
+ 	Programs/WebKit2APITests/TestWebViewEditor
+ 
+-noinst_PROGRAMS += $(TEST_PROGS)
++check_PROGRAMS += $(TEST_PROGS)
+ 
+ if HAVE_ATSPI2
+ TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility
+ 
+-noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
++check_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
+ endif
+ 
+ webkit2_tests_cppflags = \
+-- 
+1.8.3.2
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index caf7f409436f..5785756955e3 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -4,7 +4,9 @@
   <herd>gnome</herd>
   <use>
   	<flag name="coverage">Enable code coverage support</flag>
-	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name='egl'>Enable EGL support.</flag>
+        <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 	<flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
new file mode 100644
index 000000000000..6d01447df80e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
@@ -0,0 +1,278 @@
+# 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-2.2.2.ebuild,v 1.1 2013/12/24 17:32:26 pacho 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/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( app-misc/geoclue )
+	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
+
+	# 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
+}