Version bump for Gnome 3.8

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

25 files changed, 835 insertions, 46 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index fabd027a4ec9..ad901911c71f 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2013/02/25 08:48:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.57 2013/03/28 17:47:56 pacho Exp $
+
+*glib-networking-2.36.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +glib-networking-2.36.0.ebuild:
+  Version bump for Gnome 3.8
 
   25 Feb 2013; Zac Medico <zmedico@gentoo.org> glib-networking-2.34.2.ebuild:
   Add ~arm-linux keyword.
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 4f891b0ca19e..10da80b9fd13 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST glib-networking-2.30.2.tar.xz 297336 SHA256 9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc SHA512 052e9d806b38983112fec5c64fc34ef254ff746056ada3e1ccc0e0a895fdddb54704150913c2c41de8ea3895cdb23bbc67ce6039c67664729d9fc361add389b3 WHIRLPOOL 9ecf68746e9e6046c2e871d5c5f3f9736e285befce719c350839d6e8136938cd6ec5d0e52bdfae88d832026171d9e66f12a70f1264f05c43c1d902a6c11a1a91
 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.0.tar.xz 351080 SHA256 190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9 SHA512 663395d3a564ff7c536b740f5daf8c6ef31f66877515afa1c02785f6f636139d545ba153e191ee23107cea8c8af2b4c1d87716f106c910f60feef52aff1fbbfd WHIRLPOOL e726ede3b0812b910c078698bab12273825af47a52fa226a5bb8c7afca5368d21c8cea3dd0fccc384f39612b462c6a3d4369f897b7867c5f488397ce941e6631
 EBUILD glib-networking-2.30.2.ebuild 1934 SHA256 5a814f8be234d03cfa959757241be0f36818fb74b1f7a5965248d4926812c1c3 SHA512 5b1e2bd0bdbacc41adb902cee26b80643272a6de68b7b44796a03961600031ba6f5190a254c23bac76084d225af491c145489fc79500de4d94bad02772ebcbba WHIRLPOOL 21b3d8c57003d2032dd48487d8420dcf9c29e86f3e0cee475d87b854656dd11670138e4ee9bc98e86fd85ef51592b68771bdd41f1004ea94159fd3304cefee21
 EBUILD glib-networking-2.32.3.ebuild 1879 SHA256 06920b6148c4b300d50d62cb35e848b319723844d2a9196cbe930c0479d26014 SHA512 7ebd5817c45b94cd8ccc63e2c54339bb5456aaeea573db63c6b8a6df5184f7a524c9b2f631c421107283fde0cc2e58f3e0deb0ce4caca91e24ba19856477b8c4 WHIRLPOOL 12bf8ccbaac62c1128e0e5d5c604f26607d3c02612e7a2ce9a7a6bc0684fd38cd6155ed1f0870d3da9af237436029f3e8cd97d4b5f79e2f9c1051b9f4051ecdf
 EBUILD glib-networking-2.34.2.ebuild 1697 SHA256 1642f3997c77b9cc52931af3211f6f5002050ccc0032017cd9056db9d044a57e SHA512 b46846dd0fe4fab0681e6ec2bda0dcaa272d604f5af67a668ad26ff56dc41871a938fe2be8e65c48c2587de592ea6be3cc0417267520f8e770245283992043f2 WHIRLPOOL aa05e5d7a813cd518a5e58f04be322b1d31278d5962ca9aed4915cf2167d4af41c9140b7d50bb8f70be961afc7e6790c2310fff6091527db4a2d4e22c099d9b2
-MISC ChangeLog 9081 SHA256 ee993665ad32ee1e78eb161c3574f59f258cfa5978b07f0bcb0f3141c1b032f4 SHA512 46b71313fc00830bcca024c7e230b3571d48b07919fe4d578331256cbaa8b59878adf8073ec1638f3aa50b4d26f1f553b285370dc8ea7d1f624e37fbb56ec517 WHIRLPOOL d6842723d22ec2d2265cd6e32a33d32151e394fb723cdd8570bb34ade416e03efefb6f1dd8619b034c3e7987188bce48783c4cf78b47b3f05873b1398e358226
+EBUILD glib-networking-2.36.0.ebuild 1697 SHA256 ae5f036bbed1fb0ff34cb9eb464e35e0d0297dcb9b5259c88b471edd925d01bb SHA512 454e07150e47c079f06233c10a8b6937702546b7c49ee17c7e9afd49e9823626141292857178e57f7468de479639e0c6dba656af95e3ea8bf9b2be4c1e9e1269 WHIRLPOOL 5d305cefc43686d74ceee80d705235e8d7026300d9db924decf9bdb0b00423c109b1b550d4152581e4ba35d27853bb79a663b4b24509934a4d7948a5ffbb242d
+MISC ChangeLog 9226 SHA256 1d7fc84fd8898d5de92f613298b926d009b073ae06688320ecbf6527abed461c SHA512 f8de4414ed9a9b676d630d51069de465887a09aaecb0e1e69f702e281c7bc8d0f4c62183ac4366d90dc2034a2a9f736bebdf4df3810f37027db87fc936eab4db WHIRLPOOL 8bca023b0271b336a4f6766c7920f16c8cd2b6d7af0aac711e1c6f17e7aee0341e72f5fb33e3995e1ccac35d6a0343c4692acb60a47cd4ff3c5f4ccf37d145d4
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErJXgACgkQ/ejvha5XGaMxyACg8MFirEv5AwEQttEviQ+xuTGX
-WR8AnRN2McTVlHc86/9LWLIpFZxIGf/3
-=0g6V
+iEYEAREIAAYFAlFUgk0ACgkQCaWpQKGI+9Tb8ACfUvhgmB096AkW3I5nI0j5uo5q
+3JMAnRfE+aGWnjkNP0+fJrM7J+YoRylA
+=zes8
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/glib-networking-2.36.0.ebuild b/net-libs/glib-networking/glib-networking-2.36.0.ebuild
new file mode 100644
index 000000000000..7b5d29b19df7
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.36.0.ebuild
@@ -0,0 +1,59 @@
+# 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.0.ebuild,v 1.1 2013/03/28 17:47:56 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+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
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
+	smartcard? (
+		>=app-crypt/p11-kit-0.8
+		>=net-libs/gnutls-2.12.8:=[pkcs11] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-2.11.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus[X] )"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	# FIXME: new failing tests
+	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"
+	G2CONF="${G2CONF}
+		--disable-static
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+		$(use_with gnome gnome-proxy)
+		$(use_with libproxy)
+		$(use_with smartcard pkcs11)
+		$(use_with ssl gnutls)"
+	gnome2_src_configure
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/net-libs/gssdp/ChangeLog b/net-libs/gssdp/ChangeLog
index 4e469133e36f..2f34de63ae1c 100644
--- a/net-libs/gssdp/ChangeLog
+++ b/net-libs/gssdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gssdp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.53 2012/10/28 16:23:09 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.54 2013/03/28 17:49:02 pacho Exp $
+
+*gssdp-0.14.2 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gssdp-0.14.2.ebuild:
+  Version bump for Gnome 3.8
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gssdp-0.12.2.1.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index d62e34741781..7277bc7b29a5 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 DIST gssdp-0.12.2.1.tar.xz 271976 SHA256 928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414 SHA512 a5ee79f128c52431266d20fadfef8601b61bb1ce2a5fd6bffbde79b48d48dee001d5fc742e61db8c7ca1d25ef083747e307411a2aec10dc8cb1c3eca015d3aaa WHIRLPOOL b908cf776856b0ae27af202f857f01c80d64aeeebfd1f22d2b10445c2bdbd6659ec1dccd6bba2a891670bc80e23d3caa09bfd315a26c5f3cc224d9a3c5320f41
+DIST gssdp-0.14.2.tar.xz 274208 SHA256 a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc SHA512 fb3b33cdbf427282bbd455906861030f9116a40d024635f65854a93b28347857c2e1099946def82ae9d0e078de7fbabfd3329b0e9ef59be1f47b2fafaa3dd92d WHIRLPOOL 222061db941d743599dd04c09e93167db752cd018f73b6dee219aad48f51ff82b660edff8104d4ace1fd4c196928afcd9b24514c3ad36fe07c42b88aac2e119e
 DIST gssdp-0.7.2.tar.gz 367062 SHA256 c071f09cd47f2d274c34b2d083e83586339ffea27e8efac2c057d160833b44b7 SHA512 639a10a8cf01f882c85d463cdcc959c3a8a598f9c7573320c096b9cc91e06896ad7d1c53632447919a38beb81124781c0e974516729cbe5f67dc41fe0f5d9a01 WHIRLPOOL d32724a42078fd35117b2ad12d496ef801c42083a1541dd27c2000283d9442b772cf8211554a111183c672215dfbf7a8193270ee80803f31bf55b56302922b9b
 EBUILD gssdp-0.12.2.1.ebuild 1464 SHA256 c42a28714f0bf110f34eb5c95789b84bc506684a4dcf82a74970722ac5e30acf SHA512 7ac1be80a6d81523e6bac1c7892edf2701808f55d6c9bef3d9921325acf94dc43b6a1763f62359202b0d53944b43f2fe6afa20f21de09738fc5c04bdafa65add WHIRLPOOL fa9e3aadbf266a8d0efe99dfc029c84f06ba07c6f3b4f8ce9f20888f1da3b3eeb0c10177bd923c46af79641b4997353fb1a0112144cc5ace699d9a90baa2ce4d
+EBUILD gssdp-0.14.2.ebuild 1282 SHA256 48c77d43e1010b7e69a7fc2e6699ccd33c0822c570a2a1db3144d136d8d20d18 SHA512 75f9cf800722da05e9177c57d73c5909a0573d033f942c5d87a7ca20fc72f96da500877c8ee43f1bb180ee16dc1f79f45871c5a5c2c86a070b8e90a8c8d5ca3d WHIRLPOOL 6d0b622b848308514271314ddc186944937597d869af5054d4e3323d54f34e25cac76defe2737441c7ae0ea3f769594f9d0f9f855a143d843c887aeeae41683f
 EBUILD gssdp-0.7.2.ebuild 985 SHA256 bcb3d17e4b92910ce51a9487bf431173cae2b5929a57f35cf3f4c6b034c829a0 SHA512 545030406c1cca2ba4f429eed672c74a34c29555b21673c8dc53453359e85f37f295c5dffd710eb69ee111477befaed6aaf08dffc9cd7b9d5aac12c1d8d65ed7 WHIRLPOOL 2a4228823fd7213b4f76cb63e4a35806776aec68677610a37dfa3fdb465bb5c127c40e8031b68a08aae5c401ffedd46973e573ce6abf62201ce7a98b5f94183d
-MISC ChangeLog 6540 SHA256 385ce60cec66f71922123dc069c383bfae1d9ccac85fc235097c354eae8d0d2f SHA512 71906750e631be7b6827692b4a079b423917e2dff762cdf3eff51ca78d979d840b18c210adb6c48425759ba09c687313214561febac4498cbdc6ac905d146019 WHIRLPOOL 10bbc72f330aa25d8f2eae60a490078ba39b3ca654ebbf7f83d323828d5ae2935d6f8afcfd1495a5750be587c79fd77eea7440675938fa691fa77bc16bea78c9
+MISC ChangeLog 6665 SHA256 edca12d2cfc33fa2ac9ab3092e790a25680a6cbd5903fffc46eba0cf30e4475a SHA512 4ff0e987be95c793a44937c2d0f7e1bc018efff1cf58dc2eb3c5cce9af27f37f599ac67e71e66d0136a80107c927cd2c4eeb43aa9074088685f6eb8924b76252 WHIRLPOOL 134c6bb7dc4563b1d92d1df43d130011cd0336896eb7db85ec27d5c7cc199620885aed7b29ad26bd363845e9a0982081cac970540157d28c867f4c23d106d8c5
 MISC metadata.xml 299 SHA256 cd6e7f2e0fe83ce9a1ffb7ac6dd6ef996632477e234cb9765b7e69dd5c24f852 SHA512 d7dc41e7fee0ffc03ee247c9ebbfbcb07541b5a02f35f1579bbe7c1bbd20aaa82e1e60f1ff8b692d82b0d32bf82bc23915e63dfc30c5811676b6226e59fbe00e WHIRLPOOL aad69ff07d685f2d52c363c18d044bc98198c5048d13f6e0a8a2307923e069830a2f864f7c4f0ad02e97916a1267b43586e8b75861629bfd41915d15f765c245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNW+4ACgkQuQc30/atMkA9mQCgldV3E6WIaZdWIfVacXu9cS6p
-OwMAni6QaQ/ztSzGYj2vacVwSJcSgBCS
-=HToZ
+iEYEAREIAAYFAlFUgo8ACgkQCaWpQKGI+9Q4jQCfQSLmDrrLoju8iO1/6oi0t7K2
+DooAn3JKLXjWWnmOKECxbcoNc7J9HUzs
+=Ty6d
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gssdp/gssdp-0.14.2.ebuild b/net-libs/gssdp/gssdp-0.14.2.ebuild
new file mode 100644
index 000000000000..761d88a48bb4
--- /dev/null
+++ b/net-libs/gssdp/gssdp-0.14.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.14.2.ebuild,v 1.1 2013/03/28 17:49:02 pacho Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org multilib vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP."
+HOMEPAGE="http://gupnp.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection +gtk"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	>=net-libs/libsoup-2.26.1:2.4[introspection?]
+	gtk? ( >=x11-libs/gtk+-2.12:2 )
+	introspection? (
+		>=dev-libs/gobject-introspection-0.6.7
+		$(vala_depend)
+	)
+	!<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# Disable functional test as it requires port that might be used by rygel to
+	# be free of use
+	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+		-i "${S}"/tests/gtest/Makefile.in || die
+	use introspection && vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_with gtk) \
+		--disable-static \
+		--disable-gtk-doc
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 86f51ec401f5..71e5e60c6ac6 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gtk-vnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.103 2013/03/26 19:17:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.104 2013/03/28 17:50:09 pacho Exp $
+
+*gtk-vnc-0.5.1-r1 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gtk-vnc-0.5.1-r1.ebuild:
+  Version bump for Gnome 3.8
 
   26 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> gtk-vnc-0.5.2.ebuild:
   Drop trailing whitespace.
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 2695855d439e..f8b2192e79a5 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -7,14 +7,15 @@ DIST gtk-vnc-0.5.0.tar.xz 386068 SHA256 1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fc
 DIST gtk-vnc-0.5.1.tar.xz 413652 SHA256 1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40 SHA512 b801e1e4a0c7df055fb2beab65026b9a282409930efdd7b8c5d8b8f108e15b460ed10dffb3dc3e44904d10856cdce9fdf330cbeaa2224c8b47523b59afe237fd WHIRLPOOL ed41f62efbb28ce349756645ce787fc284f1de2bdb97b73d455ea2fb17111be434ce54baeac907fde6d4ff4a7b323cc7742f9d5903668d3d326d928787d27c44
 DIST gtk-vnc-0.5.2.tar.xz 388112 SHA256 b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f SHA512 e58a0bbb4c5d1802d51936d5869ccad55cd405f6939f49445e224863866a33173e47e055d88f50e60b3f864a7e393faf0c78a219a08ee8a8c1fc8fe108f9824a WHIRLPOOL 339260787cb7970fde2a660186e46977d0a5f6e2966e859ebfb632cf29310c1957e0e3c9b0ac06a3d420caa4a20900ad168658c49ae0da0115cd40b8ece6990c
 EBUILD gtk-vnc-0.5.0-r1.ebuild 4541 SHA256 22011a079999c2b10422176a44e08acff21fd48492e55343731fdf83a576bbca SHA512 47acae813bf425cef0674bdacdc9632a83e9e8df934125fed921a4802e6e93e59559d00acc7dafb0e12eb8f5a9bbcb0e6d247d84f72f57db5484e61efea87515 WHIRLPOOL 47835bb624ecca13a0c9f5d1d79c08748accf804b47d601d79a5c28397033f237cb29208be8f7ad40c8e40535ff8c015d07a3a494ca7bc9e969ef947ea60b915
+EBUILD gtk-vnc-0.5.1-r1.ebuild 3955 SHA256 4ad101d959c5765d46129cb9820538b0d8183d73544e3271019d8b617122970e SHA512 e302ea2f29dc24e51bf3e6723cf238bbd89d48c98d5b161f0114a6d0abc1868d6b4a1f1f6d48283076edae38bd4592c3c75d579a2df207ca504c81ac1235f6e6 WHIRLPOOL 3e28fe461ca1a2a12d5369e8c6992fe52a96226db4cc1f1cbb75cccaee819e693eac21d08bac83bc3e4e10eb812991a0cce5816c302e70179e5914f40258b159
 EBUILD gtk-vnc-0.5.1.ebuild 3920 SHA256 8a1d9991867a636846e5689c6308a1448a23d587b5af358e8c149fb3ae43c70e SHA512 954a3d412dd09dbbd8d28b26c9f3d7bbf574ba82c3f43503592cf68f53a2452ccd36b1d3668d34b8272f219aa9849f60ba6c755e00faad42a296b9bebbb2b066 WHIRLPOOL 12ff1c69ed38ea2653430a8a806a2f89fbd49018c009a004f7991c135755942f487d4ad64a17b8cd0efa13c51331ca36ba8f59d8dbea4cbcfa0444ec24ea8f16
 EBUILD gtk-vnc-0.5.2.ebuild 4839 SHA256 32d25c6d4f6b07576b0619883a9bd478d38d42ee4646e1e2ea0e12a164e4f023 SHA512 406ac2cdd1664bfb2ac2dfce17a95ffb22128b95dcf793b8a529b0cb0edc23020c991200f0f1142cc8df8de7a30f8481109b4cb9cf9e247a47439971baf85ef8 WHIRLPOOL 31be1800be21cd883b431569317735fd4d11732cd55fb2d45563d592cc30e2f223d5497ef7154b3b3523b327f50a9f7ca7ab1a6dadf54398db3f10a00e4b4ebe
-MISC ChangeLog 15213 SHA256 2c104c685a2f42b888708545e084c5272390accf350edf8717a118ef32b0d866 SHA512 4c011ce695afa8a32ac9b632d67dc4d8c92f26d3c91e84e5ddd9fd7406b6c9025e5d66b7047ce112404cadac7a8bbb61ee2666a421bc72c33eaa2f63eb0be51b WHIRLPOOL 4a15ce68b3266dd9772d12acc93e588375cf8d74550eec50182485f8847ac6a3331eefc57f3869f54538becccee7b5e15eba7070a15ed51323377c7379a09106
+MISC ChangeLog 15350 SHA256 835a7c76a9326b2be3fbe1b40e8adedeb71d02a774d3231a2234da0a7d5e2540 SHA512 e6035c87728571e0f7805977e814aa14309bdd87614243167efaace1f566c8730fe5d30929c707033158c58547b130cb7dbb033cb2934f81a494b2353d1ba0da WHIRLPOOL 0b33989b06c0a2cb8d1c61c96947d59f7f6b8434e2e192349462443006f061a524120a303456558d3a18d173dde95c3b1824095dc784a95723f677d282a3812c
 MISC metadata.xml 422 SHA256 207a74cd4c91430061e1c1104813b2563eddf87f08e4ea0d559248bbd4b6b9a2 SHA512 2bfaed71d1dfe08148196b4ed7e725a5542094c8ea3f955d9b112a7e1c42e8f6e71f851c716bcf234c289cae665c6dfbb0ecc0b08a2a046a008c80861a5de7ec WHIRLPOOL 639d99c1e86b4cd22f1a8fa0083600e60ba7e541066c22c1beac0ae6aa14e7da6cd5eed917ce2908963eb2d779e7235249bbcd45eff47f26cc73d32193474838
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFR9EMACgkQ1fmVwcYIWAboYACaAkHIR4jk3uWEBB6kvYowF3dU
-IQAAoLPq7LVmGtjdOKoj7WR/Sx2Q1ZvJ
-=Yxwx
+iEYEAREIAAYFAlFUgtIACgkQCaWpQKGI+9QAoACfemqWesAUflB13sPyDVYr76KW
+Tm0AnRKPz1GSXR5Oze6jFipHkON7PQ3n
+=0a9+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.1-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..5911f1dfea87
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.1-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.1-r1.ebuild,v 1.1 2013/03/28 17:50:09 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+VALA_MIN_API_VERSION=0.18
+VALA_USE_DEPEND=vapigen
+
+inherit base eutils gnome.org python vala
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://live.gnome.org/gtk-vnc"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples gtk3 +introspection pulseaudio python sasl vala"
+
+# libview is used in examples/gvncviewer -- no need
+# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
+# TODO: review nsplugin when it will be considered less experimental
+COMMON_DEPEND=">=dev-libs/glib-2.30.1:2
+	>=dev-libs/libgcrypt-1.4.2
+	dev-libs/libgpg-error
+	>=net-libs/gnutls-1.4
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11
+	gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( >=dev-python/pygtk-2:2 )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-0.9.4 )"
+# eautoreconf requires gnome-common
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	if use vala && ! use gtk3; then
+		ewarn "You must set USE=gtk3 to enable vala bindings support."
+	fi
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	mkdir "${GTK2_BUILDDIR}" || die
+	mkdir "${GTK3_BUILDDIR}" || die
+
+	# Remove a few files that were autogenerated during distcheck.
+	# Having these around in srcdir breaks out of tree build since they're
+	# expected to be in builddir, which is correct for trunk builds since
+	# they're generated files, not source files. Funny false dichotomy.
+	rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
+
+	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#????
+	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
+		-i src/Makefile.* || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local myconf
+	myconf="
+		$(use_with examples) \
+		$(use_enable introspection) \
+		$(use_with pulseaudio) \
+		$(use_with sasl) \
+		--with-coroutine=gthread \
+		--without-libview \
+		--disable-static \
+		--disable-vala"
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_with python) \
+		--with-gtk=2.0
+
+	if use gtk3; then
+		if use vala; then
+			myconf="${myconf} \
+				--enable-introspection \
+				--enable-vala"
+		fi
+
+		cd ${GTK3_BUILDDIR}
+		einfo "Running configure in ${GTK3_BUILDDIR}"
+		# Python support is via gobject-introspection
+		# Ex: from gi.repository import GtkVnc
+		ECONF_SOURCE="${S}" econf ${myconf} \
+			--with-python=no \
+			--with-gtk=3.0
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	emake
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		emake
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	emake check
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		emake check
+	fi
+}
+
+src_install() {
+	# Parallel installation fails sometimes, bug #328273, upstream bug #651923
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make install in ${GTK2_BUILDDIR}"
+	MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make install in ${GTK3_BUILDDIR}"
+		MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+	fi
+
+	python_clean_installation_image
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
diff --git a/net-libs/gupnp-av/ChangeLog b/net-libs/gupnp-av/ChangeLog
index 3b3638adb5fa..c2082578161c 100644
--- a/net-libs/gupnp-av/ChangeLog
+++ b/net-libs/gupnp-av/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gupnp-av
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/ChangeLog,v 1.27 2013/02/02 23:03:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/ChangeLog,v 1.28 2013/03/28 17:51:32 pacho Exp $
+
+*gupnp-av-0.12.1 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gupnp-av-0.12.1.ebuild:
+  Version bump for Gnome 3.8
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gupnp-av-0.10.3.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index d3f170a9c1e7..585a1be5920c 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gupnp-av-0.10.2.tar.xz 289784 SHA256 4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf SHA512 55ffa55771b84ba10cb17e1b89351f30e02b953ad4c1d1d2aae7320e4a3533e3f22d8a89f90c1820e1096e2692fb7f08135cf6ad2844e1130e9cbc341cd386fa WHIRLPOOL adc152338a0b4254962a5a31c23cd5862654855014b6b5806621a9b1816fb4c7f7630030ee8c058f47515308f86265129eedd81411f7657e3ca8f1c05023d76e
 DIST gupnp-av-0.10.3.tar.xz 287596 SHA256 d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2 SHA512 fcbc64dfc2369810ef698b0ba1301491e7e81ddf3aadd5e5657e0be68b7ed81f8411eecca0b3e3b694aebf8db90c6764985bfe231c1ce2e1dfdcaa3d9ff22725 WHIRLPOOL 882bc61445ecdd036663a488b7591a2002f90a225e0274a423a8a649ae3798d0de6b971f9403baad2453b057d14493d82934ec5835a28922ca676daa4db18769
+DIST gupnp-av-0.12.1.tar.xz 336864 SHA256 7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4 SHA512 6800f9d8c3df269443b624edfb98f7e3f63c2d3c682870c375f37651fab5d58f4b0b8963074762dad9d9f33f431557456572975a321b85916cbbfe8e91544142 WHIRLPOOL 9466fa1c446159e2154dc84e0e0cee6d87b1f8ba644b056b25b631f479a019255c5acef74febe5175bea9714c9d5eef01864ad6e16bddbab1d66a53441507dea
 DIST gupnp-av-0.8.0.tar.gz 407464 SHA256 e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9 SHA512 0adefc9ddc87c1a24326f0c4b9a70f8f390b0b5f831b59ca85a16142ade68697e63db6277c695b65d7f5c710b3974952c8cd143011693034ab6a5e401181edac WHIRLPOOL 92fe9b2aff2e9a093f9f89c70659f804137cfba80d006f36247484d3d41c77e8391b1231b15213c8f1c6fe1bdd5be7d2c62dc81556c15b50b9a3d00286fcf6b7
 EBUILD gupnp-av-0.10.2.ebuild 1020 SHA256 9df8edc162dfaced97da7d66313120f50dc41b70714c84cd79f456bdf9a67075 SHA512 e05fad6e98e32ed25bb604717aea768df9188776aea148404bfbb2068b033a795e9c40e8920ba907f0e5959dd474fc4543df3bbb94fed6639bdf87d9d57d3b0c WHIRLPOOL 7badef7a353e6de0f5612e95eb343e6613603b3081b907d4c27890954472977b54b6e32fd488bfd067cbccefd387156cfccf4e7ea947d8975be124bb10da1680
 EBUILD gupnp-av-0.10.3.ebuild 997 SHA256 4d91c6855e67e2265b7b2e911294d03c4dd2025be1f1cbd27fad719621112e79 SHA512 1e9842da7bc0d77e5973e21dcb3405305b0230f847293f61410fd292cc0c67924a4ae4544209ad31ec9b86617c791fe78fb078050689c10c3c35747504a9c492 WHIRLPOOL 2fc5922b393233265726ba278bf6e879b9380828e1cc637a050951d14e2ed39b0609bf0c0a865f26ec0cb0ebae7bd83ade1f414a893f5dd34ee0b63e0f90345a
+EBUILD gupnp-av-0.12.1.ebuild 1007 SHA256 9e3d898f906d88416bce738b024467ce85b3f0299bd49fb48960898abc59d1c1 SHA512 81b9b1ad7bc9b66fbfb23fc790fe8a6c03f9751f8660b2580ce2a21151b8197f0bcf1d0531fc7967491b1a7b5678ea04e6cfe3a74f893727c0042e1fc485f0c4 WHIRLPOOL e8f01f9b860b20b02181a01399de9dfcb984e634d4a6cf3d05ec37a576016687f8fc6720e4444b49dadc375c910014e69bd166815090f586a1855cde006bcc69
 EBUILD gupnp-av-0.8.0.ebuild 1078 SHA256 3e74c50ee3f3ff34d7d140e46b80e4d5df39333f971935b3faa401fee9e93849 SHA512 da3c5fb89b0e842d32eebab9a15e48e5f3163202189bf7c1ba75916ba083ae29c7111d0b9addefa4ade4e9bd7d0bf55fd4b028f73214723237747fd57bee8921 WHIRLPOOL ac26c4629b040f606c8263fc2105d722ad57be576b3a69a58c26aad0d2a86ed9abcdc15ea7332e42af7d17d6efa36029e6f7b8c6c353fc4a9141fbce347004af
-MISC ChangeLog 3837 SHA256 e851e9a8d69d4c12ab252fe9135f5736de3ab401ee0f81b47160be9df0a8014c SHA512 b130b985ee286a6c14681aa05ed51d2c7b9932f5a2e4276aed44b408dfad2a5c9ac0a50aa991710b299923ee80e4693a8c0be34aef75134cf5fb9a052f0c3ffe WHIRLPOOL 00cce4fb5d2882fd024f14dc7ebd58043618d636bf4eb92c4725437a564448457d7c2d0f35111970b1857e130615cb12cd54f3fe6dfe50102cc433fcca549d0a
+MISC ChangeLog 3972 SHA256 430ca73b8c0a72bd7035934c42a8a7f3c7e73a643520edd29b7609cb4b980d94 SHA512 61e678088e781efde11e4d204b21a1f709e90be4207463ad8c1716d6012dfe49467c076bcf066c20697c30b59c58e0cd2dbafbd83970bdad875c7a8c53721feb WHIRLPOOL 0ca0294874f1588902f68bbcec4efa09740779d8175a188b7d80757819aea083f60fa219d33d029a2cca2c92abf337c95ddd22abcdfe72442ec9e95457445c79
 MISC metadata.xml 299 SHA256 cd6e7f2e0fe83ce9a1ffb7ac6dd6ef996632477e234cb9765b7e69dd5c24f852 SHA512 d7dc41e7fee0ffc03ee247c9ebbfbcb07541b5a02f35f1579bbe7c1bbd20aaa82e1e60f1ff8b692d82b0d32bf82bc23915e63dfc30c5811676b6226e59fbe00e WHIRLPOOL aad69ff07d685f2d52c363c18d044bc98198c5048d13f6e0a8a2307923e069830a2f864f7c4f0ad02e97916a1267b43586e8b75861629bfd41915d15f765c245
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFUgyUACgkQCaWpQKGI+9TO2ACdEocU67G7FHyO1i8UsWLHj7Ls
+XmMAniUYFO8utcLeVzySSiGfmmZ4Pvw3
+=t5nq
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.1.ebuild
new file mode 100644
index 000000000000..042c42c8a09d
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/gupnp-av-0.12.1.ebuild,v 1.1 2013/03/28 17:51:32 pacho Exp $
+
+EAPI="5"
+VALA_MIN_API_VERSION=0.14
+VALA_USE_DEPEND=vapigen
+
+inherit eutils gnome.org vala
+
+DESCRIPTION="A small utility library that aims to ease the handling UPnP A/V profiles"
+HOMEPAGE="http://gupnp.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=net-libs/gssdp-0.9.2[introspection?]
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	>=net-libs/gupnp-0.19.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	econf \
+		$(use_enable introspection) \
+		--disable-static \
+		--disable-gtk-doc
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-libs/gupnp/ChangeLog b/net-libs/gupnp/ChangeLog
index 56cc9f7a9bd5..701648801085 100644
--- a/net-libs/gupnp/ChangeLog
+++ b/net-libs/gupnp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gupnp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.57 2013/03/25 16:36:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.58 2013/03/28 17:51:23 pacho Exp $
+
+*gupnp-0.20.1 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gupnp-0.20.1.ebuild:
+  Version bump for Gnome 3.8
 
   25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> gupnp-0.18.4.ebuild:
   Stable for x86, wrt bug #458984
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 6369aa55bb37..745d2588d299 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST gupnp-0.13.4.tar.gz 530231 SHA256 7974953f38a41236c875c3df509abc43e8218b5925fdc18212a73b1ae0d0e7e8 SHA512 fe7f3005d320c314b95fad707cd508ec8f5c7a9a93f79b858a7b53ffd8576c54ca0f7490f5de6dd17a0c9d71c99504f2afa22d54f6a8c5866f3b8c7c2e866400 WHIRLPOOL 73d34da237a1a0332fa6c01f763bdf49397c124fdd0a62a15594beade989b1ae73cd54185d5d4d06ba24544ceacd1959a0345b3a49a4f5ddfc4d99baded851bf
 DIST gupnp-0.16.1.tar.gz 506529 SHA256 f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe
 DIST gupnp-0.18.3.tar.xz 359744 SHA256 5920621de6386664ee759386514effa5e0544e40298245e4c67076d92715fba2 SHA512 c374ff94c28d2b0ea1dde8a13871a71e86132780ae63a9f96d9e606844dde83dcf182ab81fccc5dd191df772f073e507b22ebe82c8f95954a345475e4752d9e4 WHIRLPOOL e38ff92d0eb5a8b279aa0bac3363c0a2e0da941be634ae3b1f0c37af8acbd8db732b2e661f8a5780d3fdf7129f58796a3cf3a6083e7d9e09bce0c4334c9f9c42
 DIST gupnp-0.18.4.tar.xz 361524 SHA256 6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1 SHA512 94d89013d58a4bf2dbe278c8d4eda8e06348a698de16c20f51d13340d81d216a7aa823fc44b535e4f3b2a5a63a4b8fc91a144e3cc1dc05b2dfe521e1afd72a22 WHIRLPOOL 6cdf3d107a8845e70f3fcba471f8d6a7bc5166862407a2c88f52a72e1d7a8399d80fbbb69ec0016edb5cddff3ff7a03e078147ffb0cfb5379258c0c494374c04
+DIST gupnp-0.20.1.tar.xz 368108 SHA256 a98ab69289742a075c9a7655650e0d1944a3886bb7851bf40ed82608a9ddac61 SHA512 02d8f4b100dc093b516482cc51f971d0b551d798da36360b5986076a5bdd9aea0ac18f7fe9356dc6757e357c2b3318ef3f8d5c71610c69dc973a7f136c053964 WHIRLPOOL 433facc1b29bb18a71e55b1d517fc4ecee851ca0c22312fd5c8c600a64b5a82445c644261a5b7c00412d2173e4ce87448338d5cf7fc2dc7258ee83705029f369
 EBUILD gupnp-0.13.4.ebuild 1245 SHA256 88e01c1aedf2a743bc3a76760056b523fa34a911014681b836e6df073083e67a SHA512 df06a8ea81d5ad08059f6f963c6bf5643b8428e3e938785e950db9d5cff4554aab167b1d408d4a0bdc31a94727b1b2371db6298224a33f98c552acd7c5a3e2c6 WHIRLPOOL 44d15aca4019ae8f2a2c538b1a0612d8204aadb9e9c0e79cd0a20720faedcedd3f1925a64bb1f38b07a59232513678bbc2eb4e29f6f8dae65d95f8d88217631f
 EBUILD gupnp-0.16.1.ebuild 1334 SHA256 cfb1a3652e72e94ef045b55f9945bc04e7d6270a18feee2bd166091826432be2 SHA512 c4a1da1e35a645d5f6dd4ca635015a508761bd0b4c0281a03703f36b83b8816156779f1e9d237172e604088fceaec183d1e67af065098f0477c4f8e354b907fa WHIRLPOOL 611d7cc7c4c34c909064946bb58b21d459a5cd8762eda276ccef4cd5e35f0c88e53bac102895dd8ecc01a196debf3f9954ce90da92d7e5eecb651f96ffe9a287
 EBUILD gupnp-0.18.3.ebuild 1546 SHA256 76d8a1c21675c2e7a1d7783285b2071b264cf40902b1ef119eebbc523c36adad SHA512 247f3eeb0449ee350d8fda7227de1d2a449354ec720796e9e80ba454ee9f568deef3d9194fe7bf1d72c0281c7c3050f80ce02980b3863c0ccde0b03de38b7c79 WHIRLPOOL b1c0177cdab87fd1334976467bf75286ee338b366c5ed0441780213ffec6eb4f9dc36e0381a966774bbd62a5ac5125097fee105a307a862c12c8b5567c8f2c72
 EBUILD gupnp-0.18.4.ebuild 1548 SHA256 3cd71eeb4f33d4090c3579751f44fac63b6277a761dc7db85120e8bc8bf52be8 SHA512 d41156bbb6434caf0474a68c2012fd03cf83c7da6edbfdd8c272e3bfb4a8d88855a4afb8d944c61e23898aca715a7e69e7e9d341a4658c0bfa008cfd80128064 WHIRLPOOL 8ff43b07bf8cfe53737e79a69048f41916f9a241826f85ced42b36766e40363779a413687a5925f0c18a897deeae5dfa465b10c555645c3a9b13e420b8568e24
-MISC ChangeLog 6933 SHA256 0a37eb25726eb01c832d8004ab70d19ccf27c7c0888ccfc7213de8695a78737e SHA512 7b2a6e7ee6684f3ea3625fb1a676accdf3b5b10157374104392dcf23af5a69353da9b3ef5628ac715912fdfe2607f083a10f49627cd6415552204f228402f61e WHIRLPOOL aef908e259fbf13e81b3ef18dde0164a883b143594c1ae9b3311f58741898153e8333a32c4a8ef798def3df033c640960d927bd39a84bacec2ad8e23c66b7b9b
+EBUILD gupnp-0.20.1.ebuild 1404 SHA256 f43c7ee7c6586884b2ed8b73286cf439539be7ae864f55e60f0bf2a1cab0d151 SHA512 cb40c37b966c0785924d1f7fea3cfc79e94eac743b1411e4d176f946d9a9f6865283529cffce17b68b1a384503b56078d7392d2e00ae29abdbf9b498af916cdc WHIRLPOOL 8b956c3014616df282fbb831a6be5fd3b2846066ec609680cdee33dec185b0e11d741059f21aa5a3d719d3163d6f4db45822b3ada35b7720a40ec37bf7825d5b
+MISC ChangeLog 7062 SHA256 27671d15744f998d5d5a28d0443caf99762e488b01b60d416e6491c13f3cfcca SHA512 ad48d4ea292de5da9046616a1abf7478861379e21d989f76a0ced42bbc6e868434d225c9a074a14896b0932198bd5e9a4d33de83533177fd716ec369e5c45840 WHIRLPOOL 5f732d1f0d0db6766fcb5d0feed49b4f2d62d070e02e69e2123b47976ede07e427c77fcd6f323f04ba2502ba4ca9abedd38a3c2cc0e1ec94070f839b2b05e6d4
 MISC metadata.xml 373 SHA256 e691ed4cec2a21d048d986ab9eed3a42ded58e6e715b773c03dcbc0b49fbd64d SHA512 db0a3f90635ae7b7bfd985f0c8962b07a44f9b24e8b027f0f13d6a486352e9be780b7d00553f55ef5a4299dd8ceaf363ce36ce70c448033967f48e09db9b92df WHIRLPOOL 49ba82cc57963804cd8948c96e1550176db5fa3a07832606eefec78a938000fe6734bbd559e364634498f03643953b72f93c406b61efc52034c1268d8d22e10c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRUHx9AAoJELp701BxlEWf1hoQAMFAhL8SzkWeddpCsdVReovZ
-qM7mkk3MamnGaCvQmTUp2ndGW20+aC7gUfrRKagllBenxgJR1AVP/6meK8Xq/QtR
-yKNUJVOZiKDXs5zCo3U6+Kd2hJjwvyGJOh1yglg46k9motEo+EpjcIKO2E17KOMC
-DjkzExXNNEqB++PnXcRlmmPSN6UL/zGDrv/xwqyQCaCQYnTGRoS37wW5XboR7YlK
-JLKSFMJ9hETvYDvajfIDBv2PKAvKwqM/JUujpKHL4v4lpYEEYPnyNFhfY6i2LDpS
-oHyzPDZZAafPA38U6iTAlOFnb6pOHbre80HYabHsidf0lgdTZiLIpIvw3aodIIXW
-If8XL519Zwa1myCzPoax6z+p2yknofHk4PwBYMXgl1UbcIOjPispzz3g28TSxQzA
-SHkRxr+MynmMY0uHr4KSeboQFWpMWqGWV860HY3j517N95nwQCceZRkAPqtKCXBI
-HQ1NBEd05apokKawdxFJBKhWDyYSMQv4AzkQwb21coTCqPbMoQGRPMfJRsmalDwm
-4fGZ5y/vsja5X/Os8U6XIM9TImUc0tXwnbeVhXnMPoAAehuXgNItZbqXYGTb6MQE
-cxjL6OMI3ffe0G1iqRKdqyhoxGsMrI5AQOseR3NrS7VuaLG3sueWJ7kYNm42hlG8
-0mVIzVI/mO4bP/HvqYCE
-=u7MW
+iEYEAREIAAYFAlFUgxwACgkQCaWpQKGI+9TBZwCfeu0aJt1bg8vyEPdZiWdc89QI
+udwAn2a/Mi/HVuot94zcfR28KfSBKP4L
+=Oxt2
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp/gupnp-0.20.1.ebuild b/net-libs/gupnp/gupnp-0.20.1.ebuild
new file mode 100644
index 000000000000..c6580a6c4fcd
--- /dev/null
+++ b/net-libs/gupnp/gupnp-0.20.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.1.ebuild,v 1.1 2013/03/28 17:51:23 pacho Exp $
+
+EAPI="5"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org multilib vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="http://gupnp.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="connman +introspection kernel_linux networkmanager"
+
+RDEPEND=">=net-libs/gssdp-0.13.0[introspection?]
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	>=dev-libs/glib-2.24:2
+	dev-libs/libxml2
+	|| (
+		>=sys-apps/util-linux-2.16
+		<sys-libs/e2fsprogs-libs-1.41.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4
+			$(vala_depend) )
+	connman? (
+		>=dev-libs/glib-2.28:2
+		>=net-misc/connman-0.80 )
+	networkmanager? ( >=dev-libs/glib-2.26:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	local backend=unix
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	econf \
+		$(use_enable introspection) \
+		--disable-static \
+		--disable-gtk-doc \
+		--with-context-manager=${backend}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index c571371a578d..0f126a49c051 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.298 2013/02/25 08:55:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.299 2013/03/28 17:53:26 pacho Exp $
+
+*libsoup-2.42.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +libsoup-2.42.0.ebuild:
+  Version bump for Gnome 3.8
 
   25 Feb 2013; Zac Medico <zmedico@gentoo.org> libsoup-2.40.2.ebuild,
   libsoup-2.40.3.ebuild:
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index ea15484753c8..fd617f4dd238 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -5,15 +5,17 @@ AUX libsoup-2.34.2-fix-build-without-gnome-with-doc.patch 1834 SHA256 d4c1e1a36e
 DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
 DIST libsoup-2.40.2.tar.xz 707104 SHA256 32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc SHA512 7803517ed8d594ef5ee2cd67e4a16baa91c22057fcf9aa2758a7d88659e6cc357017b79a7e5d32b6dafa4a95eaf5eba2b659616c5675669d891399c309316c93 WHIRLPOOL fc1a1c45f65fab56533d122bb545184e96bdfb5dd5af112ac10ffbc8461f14ab390ca9f7aaf67bf5bcb282fe3a5e6321f6eab7dee63084ee51a79f9aba296f54
 DIST libsoup-2.40.3.tar.xz 709124 SHA256 82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9 SHA512 2452e918b09206abdc5418b383b4c1d84fda8bffb09eef2a2d6b0c9cb13e625a50fc2ba07b2f6175f886bf906df80f85c47075cf72ead74532c1c656f6126632 WHIRLPOOL 0dac1a330d2e4195ad00efe7324cdde8092d7ffbce7e65aaa9cf86c74b4629bb8be4027b00efae2455add9956c0e433d92aa33edee9f056869c2f6b8fd951b45
+DIST libsoup-2.42.0.tar.xz 732628 SHA256 9e0e7eb5d3f7401ccf521fbc289fc1fa0923b7c7833729e2ed7696f7b848893e SHA512 ac2b48a25e77ea5a010033b595d7a01aecabd470b367a9ade18498b4980ca3432db620a591ec2dc08c017a68d6353b05648140c4822b1fb411d3b07798eab420 WHIRLPOOL 68dd33b9de61b5be7eb8d7e832b2955fe8cd96035a23b22ca426edd79e4c7bf7119dea778e04876e6fbeb8189415aac583e4f33bec8481e1a7f8b247049c3f97
 EBUILD libsoup-2.38.1.ebuild 1995 SHA256 b03f25e36298ebdb5d576ec2b068e0748b6d7584e4d8886cada0b613cc59dd61 SHA512 2914117d4494a8f34b42ae2483028b84d90d9e1c5c84789a094d548b79463e5736fef2070e16734bbf624afb53845261340fbc5c9d7da8ee420266f1698294a5 WHIRLPOOL 8d8dd7c571ed9ccd0121007ce6da55b688b04afa1379b34dea1f4439b26dd3177eba8d1b9a56d6c00a01be79175b2963f95f93f34066b985ca4b805774936d32
 EBUILD libsoup-2.40.2.ebuild 2108 SHA256 279932f75a56da177160f982f520a62c70d5aa697350225c523308c639fb15fa SHA512 c9396367ffe35eab04c9d2c69728e944567cedb1d3d033f1edfce92e494637c91ac1b4137308a7a98e0e077c82f1fba7911224a03dbed9eb93d57da5874791e0 WHIRLPOOL b05f43c795a7b61d36e2284a993c828e5a1d52c664f74a3523d63951f482947bdaeaa8cd40268229158f74eb4f7a23d47697d953ff58ea1f93d2e98499f3abb7
 EBUILD libsoup-2.40.3.ebuild 2074 SHA256 b6c9bf8ab156fb21abedbce06921a67c1777dbe86fc3068cc85a1faeb3bb33cc SHA512 c41527a1852dc0263ffcee47b196b383c235bb338fafb65ed79dade940a7e45c749f619b066eda7f3f71503dc9095187b07ec3530cf89ad6c3345f75c35066a7 WHIRLPOOL 611c2a7895e06204f1df2a32237a3b9dd609ae44b90f4f12005f3f5980b2b70c2b7426820403a19378998287ec27b167b0a265b31a5ed5e238ed3f10c05b3a08
-MISC ChangeLog 39571 SHA256 97c7ef4481d002df51d0dec2a5fe4ea23126e5ca314474dc1335a2c01a30d846 SHA512 74a4180956a05727b9a7339ecde577619c4a7aa4dae926ff484bb3281977ad859dfdc22a105a8975538d95153a95303a8ed801892c0e0039aa97ae9ae3078037 WHIRLPOOL 2f57984721fa215ea6135f0c8ac2d68e323bdba528ad95619ee99ba7ebc54ab40315a441c3bbea5bab38f7dc55a93b204c7c95032fd6aa94bd764f03e903b69e
+EBUILD libsoup-2.42.0.ebuild 2121 SHA256 09bbb5ee5191e9268ca7cda5da25c00ebe0c76799f61d49a4a72a8ad74d096a1 SHA512 8711ed30252f6963dcf007dfd5b3f35c262f50204847470f9e286ffacdc23e209079c284cf3c37e327ff654796733e4dc03d08f1ccf3f26e7e05d4a792b6a7c4 WHIRLPOOL fe2ea211732a0b20cb6c3c2f69c54231f4de7fd60556a13edc9df87009fbd8fc5225d4990fa4be2291a750bd0bd84d7563a0b9a538e1fde5bb28e064a1ea1b12
+MISC ChangeLog 39700 SHA256 5ce6b932a551bb195ee7ea5210a7d2f292a6b5c46317dc43a375a0db9ae25877 SHA512 4a0dc8310abe958a0a873039c6f8da8dff0f35492ed98db18064b5e8ef530e893e6dbaf3ca94d29d72ef6d74d770c810e3d98417dcefc82f3b69275c5b0b33af WHIRLPOOL 43964b927f97252d37c54f3d4dd04557be75f1e39aa201b169d8c9ea1d0deccfa95049725964205f6efa9068b8a99050160b63d8f5a95db16b654ab735d89157
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErJxIACgkQ/ejvha5XGaNNBACgu7gv4OUT2ONVJHM9IeBVa6kx
-yUsAoJ/zPTBhuB7khOgbVwUGi+lFinc1
-=0yFA
+iEYEAREIAAYFAlFUg5cACgkQCaWpQKGI+9QfvACfTGqEemiLeEOsl0+o0/UzVy2W
+9iEAn1pZUIhgZc4WAwF6ZBn/OUvBaf51
+=Atl1
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.42.0.ebuild b/net-libs/libsoup/libsoup-2.42.0.ebuild
new file mode 100644
index 000000000000..733378e8e68e
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.42.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.0.ebuild,v 1.1 2013/03/28 17:53:26 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug +introspection samba ssl test gnome"
+
+RDEPEND=">=dev-libs/glib-2.35.0:2
+	>=dev-libs/libxml2-2:2
+	dev-db/sqlite:3
+	>=net-libs/glib-networking-2.30.0[ssl?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	samba? ( net-fs/samba )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests (bug #226271)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		$(use_with gnome) \
+		--without-apache-httpd \
+		$(use_enable introspection) \
+		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
+
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+	gnome2_src_configure
+}
diff --git a/net-libs/libzapojit/ChangeLog b/net-libs/libzapojit/ChangeLog
index 16d8464ba622..9e7f496497c1 100644
--- a/net-libs/libzapojit/ChangeLog
+++ b/net-libs/libzapojit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libzapojit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libzapojit/ChangeLog,v 1.8 2013/02/02 23:05:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libzapojit/ChangeLog,v 1.9 2013/03/28 17:54:56 pacho Exp $
+
+*libzapojit-0.0.3 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +libzapojit-0.0.3.ebuild:
+  Version bump for Gnome 3.8
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> libzapojit-0.0.2.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest
index 36358f63e0b9..03e7dae25407 100644
--- a/net-libs/libzapojit/Manifest
+++ b/net-libs/libzapojit/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST libzapojit-0.0.2.tar.xz 271180 SHA256 7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24 SHA512 670b6c81f39b773ca653d0ffe651f2bbd8604f217f924918322bb5a402d4942ae52e4eb5f76198f598d8d18351ef6d25b0bbda85f1aa10e1e201b728bd1956b4 WHIRLPOOL 45ba93cf14ff44a6263f79e84c520f190c1878e398c78dc46b851c8e16a91326e56205c8df031cf710140bcd8238e9cbdeff323e0cd40213e5ecd6e2cf681d45
+DIST libzapojit-0.0.3.tar.xz 272108 SHA256 3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3 WHIRLPOOL ba5198e4f520475569b495299336755122bdb065ee5065cb3d5912486b6af1b84928de9795309db43011cd5993842ee0e8a274d44eb497be0c3b8993faf5874c
 EBUILD libzapojit-0.0.2.ebuild 1151 SHA256 f2f123f3a784d79d93c39c3d5b34e011065d1180b82aacaa657838fb7b9bbb10 SHA512 0ab3dc8d2a276026e0e7fbc28de6ff5c208c718e12fc3ace598b59a1f66282f8e6e6b6d6bcd0e8b0f742a772b4a6e6cb90d01c62643af155e5ac49202ac56fea WHIRLPOOL 1a1186a2e24f9391b493f161a993089f7e57bd8d347fa4a9d6ab76ee156fc53184546e2c5d77402ef60c8b5b2144387510059f89fecbc86b36695006ce5ee2d6
-MISC ChangeLog 1123 SHA256 17310e55d12d0de01ea7c282053635c929bebf06cfae5799d2af5459f68f0c38 SHA512 4ec9cf4d9198303a0e29fa5ecaf068ec87e7dc570f9cf1786fd2f81546ef3cbde3a0ca814b968d5f7ed257af7c6269d1d306c160afea8816384715d04c363044 WHIRLPOOL fcba543939e392b9fcd633391bc03e7e64c23694ff6f3a8b181000149a70eeeed33037d590e3b586e9b7a64e9a3026cc7a3d4a6ba8911450a5730a8607ca5a25
+EBUILD libzapojit-0.0.3.ebuild 1154 SHA256 a23912ac1899ad1bd4fea909f89d7be7a6a84112a5fceae82cc926a46ca7350f SHA512 208170b3138a58f2f846698df3a93f5876fc7f807324c5c7399faa0c3c1d92c3323d86f9570726bdafbcf9a34b88926e7d48117e863445c029d00c5f3ceab50a WHIRLPOOL d82e2ab9e8a9ee7f08a0232efa9c7c6a91d857cdc650cb174c1810b45c111f0ee75ebbf3c5b29b0156761849f03146048e743dacc77a72cfd012e48993ac3e08
+MISC ChangeLog 1260 SHA256 7800ddb669b5d6117a24bdb625b6f9bb62fa17421c0092b15584714a4b7c9023 SHA512 7dbc0be4c8aa418bc95e6b41f54ce2ca735e8f3bbaf13af5dc4007a8fc522aea483a8490bd3ab60fbbac0a42c567b0884eb4aff21ec9da2703bf3fd797188f61 WHIRLPOOL 9c0b733d97f9880442ea3f040ce56c9bdfa3db0bc65bf90bcf5f0e8e4e17af8942d4b9865a82a7c3e6d9a1ad62fe344629bc32fbe5c1621bca202764844461f8
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFUg/EACgkQCaWpQKGI+9T+BgCfZagrd1iWMAy3h/w6Se8cOWPb
+jK0AoIYQRqV4QIA/2zLcWyhVLrG6VfL6
+=5lMh
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
new file mode 100644
index 000000000000..50b2a6e0588e
--- /dev/null
+++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libzapojit/libzapojit-0.0.3.ebuild,v 1.1 2013/03/28 17:54:56 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+#GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
+HOMEPAGE="http://git.gnome.org/browse/libzapojit"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/libsoup-2.38:2.4
+	dev-libs/json-glib
+	net-libs/rest
+	net-libs/gnome-online-accounts
+
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common:3
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--enable-compile-warnings=minimum
+		--disable-static
+		$(use_enable introspection)"
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	# Drop self-installed documentation
+	rm -r "${ED}"/usr/share/doc/libzapojit/ || die
+}
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index c24c1cfd51cf..32a33f696bde 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.193 2013/01/29 12:36:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.194 2013/03/28 17:55:57 pacho Exp $
+
+*webkit-gtk-2.0.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-1.11.90-gtk-docize-fix.patch, +webkit-gtk-2.0.0.ebuild:
+  Version bump for Gnome 3.8
 
   29 Jan 2013; Alexis Ballier <aballier@gentoo.org>
   webkit-gtk-1.10.2-r300.ebuild, +files/webkit-gtk-1.10.2-wifexited.patch:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7b64a1262734..72e1b373773c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,6 +5,7 @@ AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062c
 AUX webkit-gtk-1.10.1-disable-backtrace-uclibc.patch 1056 SHA256 3d899d5d93e4d5c96c7fe1f82ab96038b8a3add8cec001f023badb1a21eebfb2 SHA512 09c9d3f5dc64d1389279d8fba9027772c9d718ea86ec9649deb01841d5b45930ee5fe9bbc61829cb7b2df0e4a05b8acfdaba0dc08b2786eb9c5e39626fe54b98 WHIRLPOOL d7dc3b235465bc4c96eed6d2b79ceb579b7ed6958b95faeab5e8421a286e03bef48bcfb963fa3cd5ef1375a75749b458227d1b4516dddfdb49e15eee1508bb32
 AUX webkit-gtk-1.10.2-wifexited.patch 1045 SHA256 c710aa913e86896365920e3eadab28c3efdbb41906b5b1818bdc40023abd0fee SHA512 078a9b5ed0b5c2b0d13d63b871d837d6dace5a9830ff5a25abe2aca12669ea1941b963c0772659975073cd604757655f0ef972dfeb5a64cd817824cad48f7465 WHIRLPOOL d7b35fccef866bc4eabc18dc0bd21bdf8f392c313cfdf5612153cae0fa4d90c8f628de5aa18c13fe812f1c19dee6bc300559229c94c9a7c2c729acc283495442
 AUX webkit-gtk-1.11.1-libdl.patch 621 SHA256 e99823ba03b99e6490b53b881f67090112d9b8c2ff30b92666e3c9bb39a5cef0 SHA512 46ebcb3ed83a0d2c5d30627c18013a6d1a481be78672e36fea7fbfaa4459a26700446c1a03054e03e87a7d84ab8990467c23187f62a11349d7ccda42c6a14ccc WHIRLPOOL 2ab17276050dac09dd3e78f9b0761d7484e06b5d288ebe75d798f5fe97714e3a7d8b081d356eee279dd2ddfb42d4838474fe48010f1629f27e1c6ff787c14c53
+AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434 SHA512 9f1787ee4cb78239475577c46361ef70e2c889ff3ed784c31a4dde638339c25d2f659f9411a11764c5a2d034783b2f47e27860129554196bd5d8faa14a99801f WHIRLPOOL 16c989a480bcb13322f9f620e291efc8fbab86730f4510b54e78145841ba3de2ee2036749ac1856dff69fd043de3fcbe17b0bdb77f11281782be608f71999e0f
 AUX webkit-gtk-1.2.5-darwin-quartz.patch 1858 SHA256 694ad79c55d737a919f6246566c5c64a0282caf02fbdb6d371152da49bcf233d SHA512 3179a4da9a6d34883de533e66e135e052da7c9f9fcb14c7b3d0a9dcfad6047408864a0cb0845d5b8f834d9a938644a3f17369df42ac9698707c1d1fec7e848ed WHIRLPOOL d8f208bea4933f5227f8aca4b965167d94caefe3517c83864259a1187f64eeb975257c9b9bef1eb4717cf6ef7248adfec6239a3685b202290829e8144556b8e5
 AUX webkit-gtk-1.2.5-darwin8.patch 1152 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6 SHA512 82f63c0954af5ffc37acd7a21ba367b9b3687773d2a3ea777d26cdbadd96f6274bd28388d667e49aec894d90efea481ff097046338e5ec581e79a4cc7b09ac10 WHIRLPOOL 3c94112f4ff8050f7762cdf750074f99903a155ee7795694a27f8f3f3308944a2bd2cad3e96110c5c673be75dd85214ba1105e376a91c3f94076fdd8e8d98808
@@ -30,17 +31,19 @@ AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cb
 DIST webkit-1.6.3.tar.xz 6794004 SHA256 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3 SHA512 cc3456608ca26684748b9f5a2ab3ecbb9b11bbef69aef1061514d23568178be8d1f5f6b1d9d8f4e2020ce033712b06d4579bea2ecf03a0300d041126e4ec8ac3 WHIRLPOOL 12de51e0367f5ae1e237f5216e4cfdcbaf99ddce586730492d68a19c62cf130c2f6157d933698072285fa15bcbb595a49b192135e0da5dc5ba6403eb045dfc02
 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.6.3-r200.ebuild 5289 SHA256 06a0faa00c6e78e389b20e67030fdb2823824e7157d6763101414c6b18785dca SHA512 fc5990313a20077f09c0ac1e38081d4f7726ad945ec2f6f2f2389cfa0608b280bf650ca6a25468640246899233cef0262304bdf3c9aeb82566e934fe2c7e1ea6 WHIRLPOOL 3fac714d69b35af4129cb996a50551dc24c4a4d99a13e1508a57718b47ec16eed4558e58831f1b9ae946b98a746cd9cf2ea052f584c587c34b022b27c3522010
 EBUILD webkit-gtk-1.6.3-r300.ebuild 5117 SHA256 7902abf3fcc751c43f69810ab23cfb175e6a8594e202dc2c58cc03d37a687aff SHA512 2e873508f04a0ae34e31eb0a3d34597c0f37d9c7e9c566164bccf4ee1305625a5ce947bfa04ec5d9174a8dfe2d49e38dcecf220a95df3a265d28ac038760700d WHIRLPOOL 146b0af488b45663a785ebfa6867ada3e2134af80a8af509f5d33f4ed04d050bea52ba61177f004211c9608e60d8e168bfdbd4ab8a2a340b23adfd413c7d157b
 EBUILD webkit-gtk-1.8.3-r200.ebuild 8565 SHA256 3b4c4fbfd9c39c52e799468c3577c6f7436bf780226536fcfa555dedc6c6b3ad SHA512 19f6c370c64d5f0c96c75d7095ab0eec08843615e6098188d32229d77ed33e325f0f2f30a113a332c98afa056ddafea5f7d8836a9ec056ff0e3f145b55fd7d65 WHIRLPOOL b4fc8b15950b8aa5910b375a73edec7409066a654aefda6744f6b9f2c83cd1eb6a89665ef01f232812ff2712d0f49f03d24d8cefa201fbbf7d2edbf691223c8a
 EBUILD webkit-gtk-1.8.3-r300.ebuild 8981 SHA256 5eb79284a24d39ea02ec7dff7ca3ab5cc294236f5f2081a762e8cef677b8f95c SHA512 eef010560195e1532f12721e0dd2f3abc32c6a3cf69960cebb917532cec1a917bc26865559965db8e21ad54bd011d7abb16d50920a71408a14b68666d92a07f7 WHIRLPOOL 824204597020337c4254c9ca9b6350b7afc8c4b11e6ad2143b8691ac12fdf6be516990c6a7ddc807b2906efb3774497af7f8eb3e9e7cafd2319dc1ed4d285989
-MISC ChangeLog 39342 SHA256 414e059434bf01f4c159694a4dbd5875aa76dc7e4a687a992e6bfff2aaeefc41 SHA512 02ad3c385761c1107fc51f8b32fff2e097210acce5330d6d2e753c9ea0c9f3363ab6128b6975563254b32b150791b4a9a7a0e4a35258364b49fb63675adad6a0 WHIRLPOOL b902407aec704f1ed09fb67947f4e1d80488a0a3fe44cd75131206f0b81f64f3c6739b668c76c7a6872b777ad404995fd1988dd5a517f0ebdc1439dc3a81d359
+EBUILD webkit-gtk-2.0.0.ebuild 7918 SHA256 1ec06e38ed3b704afcd768d7da3503672b500dbe939b17f00f32cb0ac5818d26 SHA512 785e6edd14061f1e903d26a9ea8c381c460c34995056aa102673ca1c5e6145eae8ed05e617bc81e9f8ce63242cc28b350e0a714a0e30c6c5c357da2093c977a3 WHIRLPOOL 6950c0a9913c1533e6328e1399597f20e7218a88f3330ca709eabf28e58180227127cd419b48ceb4abf3b7a94530f0012242a64be31a29abbceae0503d05859d
+MISC ChangeLog 39524 SHA256 61f7fd2e80ec5ddd5e362de7a220c339680b1b9b627b809e9e56ca10d37d04c4 SHA512 ac631b92d7de3f7deca25f2114b008e185ab515e46128068679ed31b0157fb86e87d49405e7ed5ee4f3eada467b07d32e2c9e571e462a1228a718b0be88c04bb WHIRLPOOL d1808dacdae9cec094b9bb6adefa2f4267e43fe722e397c944e24f84c8b8826ea79296d3c853fcf7bacc59bd5f493692539beba86cc155622eddda9d5b04a4b7
 MISC metadata.xml 558 SHA256 18f1557aa99ae463f768111d8e2cdd1a9eb973dec36f2322b2c32aec98ee5efe SHA512 526ca4a587a80575bd14c39c0129712d5f7a50ca487a3518ca9e3ab7bb88bed5169e4695dd9a2bcafcc89af9788510a05ba043b5db537424ce450e988dc3ec54 WHIRLPOOL cf51ac43e0bbac4181b1e33bf10cf724a079dcfb735d6462cbb426b1247e1b9ae491edf46346723168f61ee9aa8afd02b70beea920c5a2d1d24b6fe967a2dcf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEHwlkACgkQvFcC4BYPU0ohcgCgpNr1DggFseVs3i3lD0EYzI8g
-asUAoKFieOTA8Ba5j7bDhIuoT95QzghI
-=O4j1
+iEYEAREIAAYFAlFUhC4ACgkQCaWpQKGI+9RDmACZAbLwyCF51PBPrBkC8rce0Kvj
+yNQAn2aDrpwrL3GCQBSzbBUQONBi9DPB
+=9pkw
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
new file mode 100644
index 000000000000..8f56ab227148
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2013-03-02 09:22:53.791750644 +0200
++++ configure.ac	2013-03-02 09:24:56.725213764 +0200
+@@ -24,6 +24,7 @@
+ m4_include([Source/autotools/SetupLibtool.m4])
+ m4_include([Source/autotools/ReadCommandLineArguments.m4])
+ m4_include([Source/autotools/FindDependencies.m4])
++GTK_DOC_CHECK([1.10])
+ m4_include([Source/autotools/SetupCompilerFlags.m4])
+ m4_include([Source/autotools/SetupAutoconfHeader.m4])
+ 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild
new file mode 100644
index 000000000000..13c268e077c9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild
@@ -0,0 +1,243 @@
+# 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.0.0.ebuild,v 1.1 2013/03/28 17:55:57 pacho Exp $
+
+EAPI="5"
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils 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
+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
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# TODO: There's 3 acceleration backends: opengl, egl and gles2
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/libwebp
+	virtual/jpeg:=
+	>=media-libs/libpng-1.4:0=
+	>=x11-libs/cairo-1.10:=
+	>=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.32.0
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.24.10:2
+
+	geoloc? ( app-misc/geoclue )
+	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 )
+	spell? ( >=app-text/enchant-0.22:= )
+	webgl? (
+		virtual/opengl
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+# paxctl needed for bug #407085
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	|| ( 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/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	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
+
+	if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.7 $(gcc-version); then
+		die "You need at least GCC 4.7.x for C++11-specific compiler flags"
+	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
+}
+
+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
+
+	# 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
+
+	if ! use gstreamer; then
+		# webkit2's TestWebKitWebView requires <video> support
+		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
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# occasional test failure due to additional Xvfb process spawned
+	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
+
+	# 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
+	# XXX: There's 3 acceleration backends: opengl, egl and gles2
+	#      should somehow let user select between them?
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable geoloc geolocation)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--disable-egl
+		--disable-gles2
+		--with-gtk=3.0
+		--enable-accelerated-compositing
+		--enable-dependency-tracking
+		--disable-gtk-doc
+		PYTHON=$(type -P python2)
+		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
+		# Aqua support in gtk3 is untested
+
+	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+		myconf="${myconf} RUBY=$(type -P ruby19)"
+	else
+		myconf="${myconf} RUBY=$(type -P ruby18)"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Avoid parallel make failure with -j9
+	emake DerivedSources/WebCore/JSNode.h
+	default
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
+		Programs/unittests/.libs/test*
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/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"
+}