Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

25 files changed, 855 insertions, 40 deletions

diff --git a/dev-libs/gjs/ChangeLog b/dev-libs/gjs/ChangeLog
index c78d66b9eca3..8248b5ace367 100644
--- a/dev-libs/gjs/ChangeLog
+++ b/dev-libs/gjs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gjs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.42 2014/04/25 19:05:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.43 2014/04/27 16:14:19 eva Exp $
+
+*gjs-1.40.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +gjs-1.40.1.ebuild:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gjs-1.34.0-r1.ebuild:
   Drop old
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 7fc83c854f98..2fb9cce27e59 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX gjs-1.38.1-fix-unittests.patch 2022 SHA256 ca78f36f7a7fbaaf82cf3d3fe46eb1e783d6a7aa654328ee8f6c23453e81a214 SHA512 50c382c63e89619c7a31c8022c6e1dadd3aeb9eb9e318651b11711b82522ffbb3a3f6c66301d39217e01e052a51da15f83eb80abd06b6494588bcde0754699a7 WHIRLPOOL 2fbec1f23295fd6bee7c398f55262e1499a8cecb51133c991224e9594a03e82b7f97e88a5e36869b1a177ba7ff37e0dbff3c9ebc6bd945a52adf58b2a01da195
 DIST gjs-1.36.1.tar.xz 404664 SHA256 d259ef2d702fa9cc9948a35d0e701706d90798fd2855657b7e9ddc9a44dfcf87 SHA512 a2110d957f4179927d649b1da712bec7cc19cfeca48093712b7b3e8d81c06ae39752e2cbdec392c05d74343c98259af4b8c9f54448933e7e6143d9f963cfdd89 WHIRLPOOL 02676a5689d01a416775bd3cae50764f045f924c13024e289bc830ce38474585b4868aa758c5584ae715d2fba1422f6db7a92b2e5852117cb2711959d8ae6f0c
 DIST gjs-1.38.1.tar.xz 421160 SHA256 6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176 SHA512 2747c3803a1508c065d4c57ccd8a44e50ef4149393b89e88a2ece97e10b3f0e831c041a2d5b198c1eea25146d7252b4f221703b0145d8181ff591d25ab7e5512 WHIRLPOOL 5d052cc072b8c24807c5445665cde5942972b34f3345f7d0f99e09d9c018df34f64243a85215fb287762e08f11cc36fa9e4e4746c55dbd5e3cbe20cecfaa3c6d
+DIST gjs-1.40.1.tar.xz 448204 SHA256 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793 SHA512 c3da112bed3bc97d93913df6284e7616a5893abc6db0fd0bef79c8d0594c9ae85ada61f7c262839d20905dc7ca31a8ac3d5319863aaaff1c69c0d834629d78eb WHIRLPOOL 54da01eeb63d7955150c674394911ff38ccf216c262e89a162455bd21f69fe64a36bca50bffc288c2eb2e90c543d2e41128169f686f7f06523d9fb786166b2dd
 EBUILD gjs-1.36.1.ebuild 1491 SHA256 3b7d5a0290c18443a0512b60ed023258da3eb27141401866c84e1f7ee924b105 SHA512 c97c699d75dfa82a6e3d9d68abcd5504f9ddeb1b096d0b24e2cd053267bfdcf4082e9b1fc6d5236a599dcae0e3540217dc28fdfad82763ea1a467a0f8e9c30dd WHIRLPOOL 74870cf3ad36404ee87df8140390e71c5569de4d5d4be11dd97c1c7a4f948428351c8b9feb0ca018c37385d8822dc70e24b7223cf3f2d7866e970e2fb6b4d55b
 EBUILD gjs-1.38.1.ebuild 1562 SHA256 8377bc915bf41505595bb02e6add671650357442a688118bc0bd7c363744b9c4 SHA512 4f2c6caabca6d80da715e8d36a3f8829c5400e13e26e790ebd917520194c48b9c119e2e4349c9487e68d19a6e63087a0d30e7545d38fe7e183fa724fa5a6f323 WHIRLPOOL e2b68716977daf309498a08bfb5bdbd36d76ba1280738a5961daa369e0eb8b4b1c9cd901528d697b0ff00d1614b8edc9074e24dc8a55fdfe97022ce399bc3175
-MISC ChangeLog 5473 SHA256 4098c73a31c3a63bd443ea7b3fe61dc316c2116a7a603b8b7238105205348123 SHA512 d1ef37c0db5fcc9b4fecd45f91f36fd31a26be7b46ee1305ed1382e7922206cd3f9063c4f864e0d651aa5950d5d438eaa2cd291332bf24507a6219eb102e39f9 WHIRLPOOL 2bc3ea54633cf8f601924acf44d2d0c78665eb92c486767f6c1ece03ffd137d04b4ab57605a40ccd559bb848822fc7da28c52cb360fb53e7d6ce8b2efb9f26d9
+EBUILD gjs-1.40.1.ebuild 1543 SHA256 bb2e2fd06c25f4e34be8e34c397e4d12a6bf1da450c28fdd3d81ed639a11153b SHA512 16affb45c53ff3a788f4d1cc48f287e6c2d831ca1ae6ae21afcc024cc87bc84bdf4a296776de1aaee290cebc214b548afef52d0d172c35dccff7cb4431492711 WHIRLPOOL dde0bb8e9a80cea6a4f421fb525f1d86abd546deda340a3d82eb173875ce63f99cc310a01bb8051f6afdca75328ab429d4a2ff18efc0bc3e6014c876faa4aa1e
+MISC ChangeLog 5604 SHA256 29736672200f3a61ef4788b3f42ed69e9ac3d4f7fa0f151482d918af7d79e05f SHA512 e7f8e617ef65c528f14538750995e61f5378106782784463fcf1cab4d4a28a24ee8241e8c008eaa019fe1837076dce0fca41e2826a8a34f8a9f21caacb8072ec WHIRLPOOL 2ae4f9d6e9502b71cc8947bddd2ad1d81630cc06d9eb403b57f9ca5f07261c4639781bff8084a20069ae9bbdd0bc0a62751630eca3e92c4b8a2875428ba08f1c
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNasewACgkQCaWpQKGI+9R8zACffK133xmaFnAjhxXLTcWmyRXr
-hvEAnRPkZImcFcgxW2v24TSezXMadWGD
-=56cZ
+iEYEAREIAAYFAlNdLNwACgkQ1fmVwcYIWAYVogCfVqE7LSG9TbQQQoJ6IIJf/lRo
+75AAoKxq6td3z8C6vWN37vjtIjbbNc0f
+=q4cR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gjs/gjs-1.40.1.ebuild b/dev-libs/gjs/gjs-1.40.1.ebuild
new file mode 100644
index 000000000000..7c2b07e90cf4
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.40.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.40.1.ebuild,v 1.1 2014/04/27 16:14:19 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.39.3
+
+	sys-libs/readline
+	dev-lang/spidermonkey:24
+	virtual/libffi
+	cairo? ( x11-libs/cairo )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# Large amount of tests are broken even in master.
+RESTRICT="test"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 655b08b832d5..b4fa458db5fb 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.607 2014/04/25 19:12:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.608 2014/04/27 16:17:10 eva Exp $
+
+*glib-2.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.40.0.ebuild,
+  +files/glib-2.40.0-external-gdbus-codegen.patch:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/glib-2.31.x-external-gdbus-codegen.patch,
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 564f8a09ef06..c9ad86464c03 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -12,18 +12,21 @@ AUX glib-2.36.4-znodelete.patch 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6e
 AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20
 AUX glib-2.38.2-configure.patch 985 SHA256 4a3d9bf2b84f966ad2792ed7a356cf9e4f23e95efbe950bd6d5df544d45fff97 SHA512 ebdcc5775b4ada3f464a791ac0bffe0cd7a4441c9f21af327c9a99638157bbb8d72bb01aa70190c4e757481c5832763a0b569b7de6f452b4a2d05ea5b4a3e63d WHIRLPOOL 99d02f68ad97dbeb9de6dfdef5a76b19b94da9ff66ace3657bd772fdc181067c19225926ff5bd0bc7006a4abc5b4ed3a5523769fb8e488bed74b1cacbeab9448
 AUX glib-2.38.2-sigaction.patch 707 SHA256 72476721ee93a0587a89b48f35944d8b1e317bc240ef79363f82ad7ed71c2e55 SHA512 f97c30585c06a6a4d937ee8f27574d60580893e29372a282d1310f6702a7b003233c64e2d56d2ae91af53eee6465d9acb68b76027ec9428f1615bd7c25af45db WHIRLPOOL 5a478f80558bca17508e6d2b342e2204bb419818c7382f17e2c01ba6e0addc9190fc12a7817c728e35b3f7c304575551d43a529b0aa3e2fa2432b823d69f6467
+AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512 2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00 WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
+DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
 EBUILD glib-2.38.2-r1.ebuild 9861 SHA256 af45a7fe07818085a00ea1928fa63928f12607443953d73cc9402c84f357d99d SHA512 afaacec3dca8ca254cf16dce0ffcb5c5f94f2dce129ae3b2199eea3ddb646a04b2e19bf1ecdb83f2ea34350f767eb07b192c816ed630840223818ddc98a8ba63 WHIRLPOOL 8c51f2e66a8f6070656f3c70e06b92e321b9f1af9900831c8a96eea9eadee5cb4141b7360f439e72408cb7b725fc41813fe6e4436951271d89d4f43b6fe610fd
-MISC ChangeLog 85440 SHA256 2de8d09ca87a06117f6eeb59081e65ed14fa25bb183ea61de6330506d6090975 SHA512 12e9ab65cf79336f6c81d07773882ba6d0ed44fab5875a8d832185580e3fe3f91f64d69242b5d35028f25bef5c1c1b81b94a935a0cfe4f9ecb43c3b3be203d82 WHIRLPOOL 8f91fc81298a450983bdffd7a93eecfba4529f159b2e50489d9ebfe3a4ce7f1ccb2b43e9f82a8eb36e471dcef2e41236800157a75393ebc0242429373d4c2ae6
+EBUILD glib-2.40.0.ebuild 9726 SHA256 be7da7ed2fa86fd4ae41eb36d1d51aee49aa8a6b170f20b22f63a00a6feff0a5 SHA512 74a74c64987acb8ab8bac77203a0ff11a05f25b8147cde131db000cb96bcd9993843b1eab25c3a52140836fae87cf58be4aaf9cb6cc57162cb0ff1ac35ffc5c4 WHIRLPOOL d68a09c3f8c61de401da3ec2974298fdc03376ae8783c7b143a4aa136a2980acc52ae44e01d5d7c7de63994233c55922f2a391631f505646fb0179aabe860bb9
+MISC ChangeLog 85624 SHA256 4d2b7b0846cadde1eb38da8e417ac32345ceb36ff8782d2d0cdf4fb323d56746 SHA512 760ab70061c7bec1377f2c110f194cd2f93a8bab8dbe14528bc6e9ffbd432138d22b4f6a8bedf28f6e363b6bc99dfe2a64ae623b5f4db0166170eee15811cc2c WHIRLPOOL 9eeb8cad42beac17f23a3f544d294303b90f1195da8c30931e22496e13465fc6ae710656b54397721e4cb55ac1c333632427587ce63dbcd198f5a9ff6caa2083
 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNas5IACgkQCaWpQKGI+9TExgCfZtuKS3htpJ/BE67GueusTH3/
-LR0AoIGaGf/Vo1Sn+7hF94Uy8vkt5E7Y
-=pToP
+iEYEAREIAAYFAlNdLYcACgkQ1fmVwcYIWAZ4YgCfVWTsJ+9vaxCxw7oKA5YcLMR2
+eFYAn23fX2tVTkYrVtji+FoAiErY3mxg
+=n7x2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
new file mode 100644
index 000000000000..50a9370e36c4
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
@@ -0,0 +1,95 @@
+diff --git a/configure.ac b/configure.ac
+index a01e58d..59d4527 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-            AS_HELP_STRING([--with-python=PATH],
+-                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
+-            [PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AC_ARG_WITH(python,
++#             AS_HELP_STRING([--with-python=PATH],
++#                            [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
++#             [PYTHON="$withval"], [])
++# if test x"$PYTHON" = xyes; then
++#   AC_MSG_ERROR([--with-python option requires a path or program argument])
++# fi
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+ 
+ 
+ dnl ***********************
+@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 47fdd38..c7eb136 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -157,8 +157,7 @@ man_MANS +=			\
+ 	glib-compile-resources.1	\
+ 	gsettings.1		\
+ 	gresource.1		\
+-	gdbus.1			\
+-	gdbus-codegen.1
++	gdbus.1
+ 
+ XSLTPROC_FLAGS = \
+         --nonet \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index e993e2f..025ad94 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 2c54e59..3cd3c5a 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -437,10 +437,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.project. \
+ 		--generate-c-code gdbus-test-codegen-generated \
+ 		--c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index d6d1412..62ef706 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
+ 	$(NULL)
+ 
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ 		--c-namespace Example \
+ 		--c-generate-object-manager \
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0.ebuild
new file mode 100644
index 000000000000..7bab1165e34e
--- /dev/null
+++ b/dev-libs/glib/glib-2.40.0.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.1 2014/04/27 16:17:10 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+# Avoid runtime dependency on python when USE=test
+
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	virtual/libffi[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/elfutils-0.142
+		>=dev-libs/libelf-0.8.12
+		>=sys-freebsd/freebsd-lib-9.2_rc1
+		)
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
+	!<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="x11-misc/shared-mime-info
+	!<gnome-base/gvfs-1.6.4-r990"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# Earlier versions of gvfs do not work with glib
+
+DOCS="AUTHORS ChangeLog* NEWS* README"
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+			export IPV6_DISABLED="yes"
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	if use test; then
+		# Do not try to remove files on live filesystem, upstream bug #619274
+		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+		fi
+
+		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+	fi
+
+	# thread test fails, upstream bug #679306
+	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	# Gentoo handles completions in a different directory
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		gio/Makefile.am || die
+
+	# Support compilation in clang until upstream solves this, upstream bug #691608
+	append-flags -Wno-format-nonliteral
+
+	epatch_user
+
+	# Needed for the punt-python-check patch, disabling timeout test
+	# Also needed to prevent cross-compile failures, see bug #267603
+	# Also needed for the no-gdbus-codegen patch
+	eautoreconf
+
+	# FIXME: Really needed when running eautoreconf before? bug#????
+	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	use debug && myconf="--enable-debug"
+
+	# Only used by the gresource bin
+	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+	# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+	if multilib_is_native_abi; then
+		myconf="${myconf} $(use_enable selinux)"
+	else
+		myconf="${myconf} --disable-selinux"
+	fi
+
+	# Always use internal libpcre, bug #254659
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	prune_libtool_files --modules
+}
+
+multilib_src_test() {
+	gnome2_environment_reset
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	unset GSETTINGS_BACKEND # bug 352451
+	export LC_TIME=C # bug #411967
+	python_export_best
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+pkg_postinst() {
+	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+		# a warning instead of a blocker
+		ewarn
+		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+	fi
+}
diff --git a/dev-libs/gobject-introspection-common/ChangeLog b/dev-libs/gobject-introspection-common/ChangeLog
index 5e014eb3cceb..7792b4f41a4d 100644
--- a/dev-libs/gobject-introspection-common/ChangeLog
+++ b/dev-libs/gobject-introspection-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gobject-introspection-common
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/ChangeLog,v 1.39 2014/04/25 19:35:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/ChangeLog,v 1.40 2014/04/27 16:18:18 eva Exp $
+
+*gobject-introspection-common-1.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gobject-introspection-common-1.40.0.ebuild:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -gobject-introspection-common-1.32.1.ebuild,
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 6f0d10d935d5..175ca51b6705 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 EBUILD gobject-introspection-common-1.38.0.ebuild 1199 SHA256 777dc384c5e387f690bfe865829eadb379dd6a0775b61c3b653dee36c317ecd9 SHA512 cdfe7eb6fd7f4628ea729aa49f4d783505a812fce97ebb0f15b4d8508baa3ae86293c106853cebe7c1c7121852a60128da61d50e60e4594ea9c3466d44a5e6a2 WHIRLPOOL 919839cb03614a5deeb6f09912153ad76f501bc445ee00ea6a563a54911cc48c65c5654b0372dbbf18a369f26c5dbf88230b12d25180775d771a21b1a7dda1f8
-MISC ChangeLog 6116 SHA256 d9003a30e667b133dc255c7ad06b534757eacbe50936c1ccfe50aab3d7820185 SHA512 ef2773c66f063d909c94c99eb53ab2dd89b95560a9a57673134947a333341f043e38e031951287cfe883dc4a8e0b1b718b78b0e00697d797aac4ce973d3764e9 WHIRLPOOL c7a4f96d362d1f62036792babf2bd0abee597073d388939bd32c844dda8995c013429dd276024884cc68038f70dfc083e5349c5be799e3b8d2ef7a842bbf18ac
+EBUILD gobject-introspection-common-1.40.0.ebuild 1207 SHA256 b2ec898cb26bd420455374e759a88e93e9a700d63b1eae5f63ed71716438f0f9 SHA512 857b3f36f5029e55c3951faea66039c50bdfe4ff251095747b9ce99348b95ea6a6152251af6afd9e521aa718d711d252e5f1d07bc930eae0dfc5c485fa13d25e WHIRLPOOL ab3acdffa541b78fd83f8c990047fb33fd11a5494fa4ff2c0f163a49f8f839c409d442d2bf89d6b8f198bdc054089906090ceb02c482edf436c913ecf7fb5a5d
+MISC ChangeLog 6299 SHA256 9a4c9662d164f65927b090c5e147000cc15166f321ce2a0e416d08ac50e219db SHA512 64c2f5924e4cdac129a977c839d760afd11a4ab844149b57bdfcc4ab030393fd5ce64711049fc1357b3dd50fd283d8e421acbdea7b5c4b2ba86d4df4b2a93a51 WHIRLPOOL 9fd886bc85cfdabf50dfeb4fc20c8c960db348862e3f7890e646b864953b70822167403161cfe5177edcd9aa28dcc2d6ee8ea0440bbc88a672ba6f1c701f2036
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNauPcACgkQCaWpQKGI+9QaywCghzV70V52GW0HvsGIVVM1Sq65
-Dv0An2/9UhaP14BZjb/grIolKoilFRKZ
-=jmB+
+iEYEAREIAAYFAlNdLcsACgkQ1fmVwcYIWAaAZQCeJTi1CoBUzGsK3iIll4nxW5xw
+kQgAoPBRPOoPlLOd008pRnNYqN2puvap
+=CyeN
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild
new file mode 100644
index 000000000000..d9817fbb62ae
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild,v 1.1 2014/04/27 16:18:18 eva Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="gobject-introspection"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for GObject Introspection"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# http://forums.gentoo.org/viewtopic-p-7421930.html
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/aclocal
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	dodir /usr/share/gobject-introspection-1.0
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}
diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index b23a6eadaca0..6aa34fb7c614 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.116 2014/04/25 19:32:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.117 2014/04/27 16:20:12 eva Exp $
+
+*gobject-introspection-1.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gobject-introspection-1.40.0.ebuild:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/gobject-introspection-1.34.2-better-traceback.patch,
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 1533a8b0ddb8..12e99ac87a39 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 EBUILD gobject-introspection-1.38.0.ebuild 2209 SHA256 317a5ad704d6066f14ab608ad61e23eeb787d7e48a189071c3c7fdbd6a114aba SHA512 47bbe82fade9d53cf7d9637af06d0a6169ae6985949f058b37c2137504edaa16ebba5dab3638b38d1197e41abe1b44afbdab5d988d2965fcbf394a2d773352c7 WHIRLPOOL 627cefb749eecfd0011e36b0da7af33dffcd774b14bec2f6b10b07a53297dda0588b447d99ada1324d3eb381896557d128574a9f16f80e859a5677ea8926bee3
-MISC ChangeLog 20521 SHA256 f468fd1dfaa4581dc73f659e9fe5c422fa8d61cfa134b4b11c5c29b5f8c2d0dd SHA512 84905c4fb891a2c8765ca46d685b8d303edf3ec69cd463cbc5e49c6ba581b15b7a45087cef7c8c618572622061e335457aa1cad59c03b43bcd01a441f8641595 WHIRLPOOL 5204445c1611958cd1caa2954da770a0d06d524857a56bfcb29d80d10599de9adaa513ced2f152166b6d1ea7fa912e38ba03ace3251ce309347e9276910a48d4
+EBUILD gobject-introspection-1.40.0.ebuild 2217 SHA256 42bb9114769c1a2cd350b7f1ca07da29cbea6a1f8a0a9d2e065b8ca59637d9da SHA512 1a3c3de8a844b91bd9f5f38f037287c6d9fffa86fe208a4378957f6fe9bd33c7843c2cce34847f7852d656652a683cce0c97b9819c3cb2c76a17b57126b90d01 WHIRLPOOL 22abdad85a45dd71be29ed743bb66d987004c092dc18f3ff444095d4763ae682c55c56c1c4b4699929cc853fa4ee639910ef145a9c1419d644f8d1a0e4080512
+MISC ChangeLog 20690 SHA256 76c540459cf1dbc9ff23ddb45a97ddb6128cda6d0c28522157c205a4db732f56 SHA512 c4050d5f767ec3b6d15144d96c8bb5bbbc9125814857c366056289b6562a56fed57496cfd1e9d1e6c6d2107eb5d82bc97bbc2b6ff5c567b4a869c7c715c83ca6 WHIRLPOOL d70109c86b5c4c4a7bf12b773a197671d1c32f39a6448740ba6ad2dda5c90ccb4dafcf8f017b52f497f85271ffd43b657d5dc8b7fa0a8d248e614271759b6d7e
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNauFwACgkQCaWpQKGI+9Qi/wCeOEo2ViYhIZ3eZje1RrJy6idv
-o54AnRPJJkbBLzEXuoP/p6e71ZEiJK7M
-=Qqs/
+iEYEAREIAAYFAlNdLj0ACgkQ1fmVwcYIWAa3CwCeIybn1kaB4dDUtLreCyRzamZJ
+9qAAnjE6yjuNdMF/1YMYm6YuUE4aI/X7
+=rVu4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
new file mode 100644
index 000000000000..853154dc7a49
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild,v 1.1 2014/04/27 16:20:12 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC=$(tc-getCC) \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 30e863191587..b409dc058549 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.57 2014/04/25 19:36:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.58 2014/04/27 16:22:55 eva Exp $
+
+*json-glib-1.0.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +json-glib-1.0.0.ebuild:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org> -json-glib-0.14.2.ebuild,
   -json-glib-0.16.0-r1.ebuild:
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 162bf246f163..56391a433c5f 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX json-glib-0.16.0-bsymbolic.patch 1781 SHA256 7fa2b96f99788974c2c71ef6b5873dedfe50b22965a0262ba10c48f854a9b985 SHA512 aadfd889803a574d623efc1bfb64fb04274dabf687e164f58fbef81b6a03b30aeff35318b1c4f02f95c09bf2ebd3de6158d9b66008bda381ec91f1322345781a WHIRLPOOL d76e2226eaa750d8ac5fbf1bc1350beb885e62c92f5a5d2d820b2bf0967859df5f76e642d217be26408bd7e5686caed457464d237a927915a8cbce6cc28dcadb
 DIST json-glib-0.15.2.tar.xz 459232 SHA256 f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde SHA512 1cf07e09cc7eeba07a5b0131a760cd022160a9b13c380bcbf9f197dc23bdc07665d7c2832812c9e36bcefef9e8096662733832b93041d927cc2b05e31623e707 WHIRLPOOL 6cbec3c8ff36af13d46962b81bba7b3618b7de50383f81f5390b4a4178b941119cd36e84d25ae72a7712e8d08668e62c5b78c4c6e8ed855d1bbd84d25f5b459a
 DIST json-glib-0.16.2.tar.xz 506640 SHA256 a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c SHA512 6e1d9f0c1dcf02f93f22089d4669948e3b3c8217ac0b78b626d5877445e705bc28aa4b47d410fa0e35ba0a1a14df594ac069f1f86fbd0e384a942f74e60b6a12 WHIRLPOOL c58c2269f7746f1491d5a9d0996aabd739c7ac73521c0bd8f37dd82bdd537eab26334e113bbfd0be17eb88950e11c2424018b62e9a815c95382c2cb664f75f43
+DIST json-glib-1.0.0.tar.xz 547100 SHA256 dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde SHA512 9c798f473804c672447599a66db88ad5ee9e46cc55cd2051e386fe960731dc4e3d46cfcc607ff7bbf60786ae00ca88aaf4e83795133bf54988f7fe5715479b37 WHIRLPOOL 7863a63d9ceec9ebd3f337d0dc61ce24d7609930808e2a89f5dbf762721a15d351800f36e7e5e5f7ae2cc4d5d535353a4aa0bcd7e82e15868cbcd7155cedce1f
 EBUILD json-glib-0.15.2.ebuild 914 SHA256 3b110d90a9bc50df3a61738dbc1a6bd1708db37d8b5d117bc11122a317db0204 SHA512 681da7006e7a9b5b679a26d96ee4231c9564bb557ad9e551c995503fa9c146c8883fc15b87d7fd10a04f723e688c23ca5f944e0e5dc3941b162cd81297cac477 WHIRLPOOL 67488101d77b64a70219bf796eb81a1fe1ff34a2276f7e79b75d0b684c43a136fd138b690f9808ed67b0ca12b8f820f001c749b025efe43afe8545c3946b4363
 EBUILD json-glib-0.16.2.ebuild 904 SHA256 4778f9c0527811b87a62b8eda07059c20143619c48b6ad3240380ed26b843866 SHA512 17bcbb0603ed4b5ce1f0a711e740c7e6248849edb312d5dc306fb9ebc2543f46e5df1b1bc8bcb47bc9a1a3b28108fbdc51151ddf96e06130f3fbbdda78b01414 WHIRLPOOL 8dd3700c46486c661f430fa51540e5d49aeccd33fca79a322fa590bdde0f7f513b5b8a5ac8f9fcad983fd8456d4d37717543e6c1ed94dd8857c8a76732f507db
-MISC ChangeLog 7975 SHA256 b27962ba79a73d95129d6d4263150cf43b7c96152e27e2a2a0fb5283e13eb454 SHA512 f354377629b1c4debb43d7ef072cc103427d411ca7b626a6278cdf1eda86278f0adb6d212945686503ec20a7565d15925a63db599dcbfff0f4a8e567c3c2c72f WHIRLPOOL 3921edbc45e1dde5bdbc931fdbd75822aaef54490c82494be219f7d43f601d4738912c765b020723657e1bc92d9b056815d821faf1e76c09cb28f11e434ce6f2
+EBUILD json-glib-1.0.0.ebuild 1173 SHA256 5c2c21b8750de123bdf2ef31cd3522cb5463c6e4c8d6c5f803f3a1486dc61412 SHA512 15790c484735c7413e8f174611c2c47c3f726ce6149956f44b20b907e4bf4dce50defef6a4105f93f2afd45cca570929e52116efc9222eb9a2ead8b994d25964 WHIRLPOOL 0f5a2de81f4746fd139004661eec5f6da37644d9edf0fded19099c7a658091e41e266c60862ce243d887bef8461e3d83e7729b2a027be8a2a7aca78a8e17deeb
+MISC ChangeLog 8116 SHA256 e817699345a8318850a4648082c70211b8d1022f9f184fc485410966b8a77725 SHA512 7241dc68d2bd2871920df6b8728ffc1cddd8810f76bb3fd8702cfcd70fed7d8c2204c60ac3ee1661ecf2acdd8ba74d72352d87ac2a782a1112db73fe3d86d070 WHIRLPOOL 08b838b8b04e37ca220daeba406f88caaba4211c2ceba313d71172ccdcc503e636a3c78fe3c33186034dae836d00bf916bdfba97bd5abe76abe07ec17823c205
 MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNauVMACgkQCaWpQKGI+9SMJACfQu/tmSrbZIrGgPlBdBrgrf8s
-rLAAn1kiUl+H2zv/g47ob5ptjGg4qGiZ
-=DvKH
+iEYEAREIAAYFAlNdLuAACgkQ1fmVwcYIWAbRvACg5o4Uk7gYd50pnyYypEfNxXRs
+bMQAn2XPuMvoOToWjEiOwGwrIuxELbQ6
+=nArQ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/json-glib/json-glib-1.0.0.ebuild b/dev-libs/json-glib/json-glib-1.0.0.ebuild
new file mode 100644
index 000000000000..126a2a0f3a19
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.0.ebuild,v 1.1 2014/04/27 16:22:55 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.6:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not touch CFLAGS
+	sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die
+}
+
+src_configure() {
+	# Coverage support is useless, and causes runtime problems
+	gnome2_src_configure \
+		--enable-man \
+		--disable-gcov \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable introspection)
+}
diff --git a/dev-libs/libgee/ChangeLog b/dev-libs/libgee/ChangeLog
index 889565d7a5d6..7d85df0e91fb 100644
--- a/dev-libs/libgee/ChangeLog
+++ b/dev-libs/libgee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgee/ChangeLog,v 1.87 2014/04/26 06:47:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgee/ChangeLog,v 1.88 2014/04/27 16:24:12 eva Exp $
+
+*libgee-0.14.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +libgee-0.14.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libgee-0.10.5.ebuild,
   -libgee-0.12.0.ebuild, -libgee-0.8.4.ebuild:
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index e14d05ae13fa..8c0bb624e821 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST libgee-0.12.1.tar.xz 635356 SHA256 243c57f8485f6475f1daffe06982c16931a08dfcc80822d8577de3efaa6eabf5 SHA512 bf0406d1cefbdc25e70f549103c111b295ce9711e382bee42ca9e51dee605f748f3af962785dd341f11e685182445ffa227f502dd27d9c4283a9380b4e0cf3c8 WHIRLPOOL 5503bc913f044cb7205ca86acae0024b7ec0026abe0d1d3869e0d77dffd384f4ffd3e203056eea33c6a887359ca29d6d23b43f6617ea2430578f9f7ddec41f55
+DIST libgee-0.14.0.tar.xz 641732 SHA256 08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd SHA512 80e7074fd9a5dfc9431d7d624a6121388e12e430ac539376973452e15eab143017541a2ad9fa312e813de313a2ea1a734a96418fa8a1e37da8ddbcf82e2c1df4 WHIRLPOOL 536835a82e9facdbe3e9bbf4e10ba3175ad7cdd78f59550de9607ed7db515a516ca7914d5ee6b855b75454085bd23c89edc0b690666e8309f36e6aa07ce8ee67
 DIST libgee-0.6.7.tar.xz 505040 SHA256 b512bf1785fbbb6a264be5fac325c42d4e96cc560b22e3f19ea5b01b1414106d SHA512 f80221b7400de05f966e096f6147dffc3d64e67ae68723f1a56b04c6775aaa380d9694c61e84aca7317d6d72c577297d7e25af8a590c5bd87b121b6818b61968 WHIRLPOOL 1a979f94c6896e852a64075a59081671d952b1068081014ef9321680490015030c6dbf43d5f7e55f0e5e012f2e77c84e18ffc47d2b13967467fcf3d3e42b3682
 DIST libgee-0.6.8.tar.xz 443060 SHA256 a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a WHIRLPOOL 4c96a3e1dc1c34ca6b23b5b34fae7420ff9215ad07618a9b818d70b12697cac430cee95ab7bd175b4f96fbae99fcd4e1fca8da7f55064962b2cb61c641d22bb2
 EBUILD libgee-0.12.1.ebuild 857 SHA256 822766a571e725cac46524c754b4a1a1e5bb3b972c7675006f7c5c5e7ff877f2 SHA512 8e291bb7de8df8b409404b3dc2b61bea6346a5b8cba6c61042aa4b1303af5abc38849a3a4fcc3d44a6ef8c9b06aa6dcac73fac5c1d281a0019bcc32d3440328e WHIRLPOOL 55d1ce09358ae46834542b820f985af0b0e34f31c813334f1983ef0f0b908116782604c622d8ac22a9eecc2842f4b7f49e269bab6b1b347566a5ee46e016edd5
+EBUILD libgee-0.14.0.ebuild 857 SHA256 32f3c70874ee9aa9a221ea5782cce72320668cb5f1894f34a142a741a6df2212 SHA512 2a4bd0bab4841249a1efd889ee9f7bb3c197ca09a8299e4cd155314d7f21371cda53f935027db1be09b72565d18a26ebd8c979bf28a93e72db6d710178acd927 WHIRLPOOL cec7d609afda1c5350866e69f40a09191597f3e775b8d577c876deb5c14b55974f1a3cbec001feb444a3c3785e49eb58ffdb0fd75548cb59081b1fb8541d9cf4
 EBUILD libgee-0.6.7.ebuild 776 SHA256 3040540e3e4b6b4c8d6b424d3847fd521d803d6999dd841021a56c883577c5bf SHA512 4d4ca717cec11c0c068c620958d0e900fd3dde8a768a215507a5e63930c391639fb472da41b55ef228e66f8a94311094b4bba75c59b82a61d72be8e56f1b15e4 WHIRLPOOL 45dc0ebdf261957c520eb230420b1d6ea56a888d814f0d5f22a4689c9663d0aa09b8a669058b2e726b2ffb653456d6e1278ab66b7b1ab1c178ca464f83debbb2
 EBUILD libgee-0.6.8.ebuild 767 SHA256 e5720559047124194abf80a6e78878ea18f35e451b54f945045bec6d19291fba SHA512 4dc0a53f3d31b938271631cca0c73b6ff2f54efbe56557d9c5a4554ce3e218a860f0ee17f3c18381985f92f04906676277f7532d42fd1b8f2b0ab1f59a51838b WHIRLPOOL 441b9206fd51eea2867111dcee883688383b2772329816375e49fa8ed0685f50a0bb28ef039fa122969b8b7941b9f7f2eaada5e7ede6ee5171460d7178064cff
-MISC ChangeLog 12173 SHA256 c97299868899b401e4cf04e720e7c2656edef87cafd640e898472d6d9617137b SHA512 7c3bdcca42fa38652fea30a5ea0511beafbb171aceeefde7db279462f9bfbf8b1cad6b2b1068d87510c3a2bbe2aa2269923e8ecb887db3a71a20ce9507174699 WHIRLPOOL 54bbf475206e38e5434f70a1885fb650fb42942b57133dea57f1fadb9f256e19e07c5818b2f19e8f0a45e20b665bf9da0ca583e51fdff975e5e4a3fc65420b35
+MISC ChangeLog 12310 SHA256 fde15dcc99e704a9ba0fe6fcdbe3fce312658c5cef55b8cc50ca85a41fbb066c SHA512 a922d083659c141efce82b515bcc1c4b30950552758f0216bc205369e0d2488b7e5968046e47f41c89d03bc40293096f384afae3e22b4d89963afeed2f71e9f4 WHIRLPOOL 6e538669462566544f32b049cf50750bf32d90eb0aa4f2f49f6f70bd131b2d2489b9db43a91507c68ab4a95a4b4d771704e4dbac2b34516d950ea779de8d7994
 MISC metadata.xml 320 SHA256 6a6cb0b287954b73952abdea909fc27d7ef24c8beffe1dec37ea8c3dbdbd02a7 SHA512 5539efc3e074a6868bd90d616d2ed03b3ffe85fa8995d195c028a7ccc22147b223d12fa6788399f64f4622d367d6c65a333880f3182bc6e9cfbd486bafab2e2e WHIRLPOOL b84fad877a01d8ae6c1bedebb33a9eee4d4c02c82baaaf3475865cfbdc54d7f65410966b25cfa47747bbb1c8872c06482dc536d9c1847ebedb2cf2532c1a6978
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbVnoACgkQCaWpQKGI+9SdGACfXjTDY73dnqjrrrQdaPYKTIsy
-SqAAn1YMXtGPwqeJuIGyZ8iNJQx4ELWW
-=yX5z
+iEYEAREIAAYFAlNdLy0ACgkQ1fmVwcYIWAY53wCcC6MoJ0FhfuKYpjGvW7m/7ZmX
+q9UAoKliwaVgFkmFZ1Dn4PhNSeNKEX2I
+=CDBr
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgee/libgee-0.14.0.ebuild b/dev-libs/libgee/libgee-0.14.0.ebuild
new file mode 100644
index 000000000000..1edb81e4fad9
--- /dev/null
+++ b/dev-libs/libgee/libgee-0.14.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgee/libgee-0.14.0.ebuild,v 1.1 2014/04/27 16:24:12 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.8"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="+introspection"
+
+# FIXME: add doc support, requires valadoc
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		$(use_enable introspection)
+		VALAC="$(type -P false)"
+}
diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog
index 1791da8b46dc..0a6ff404f322 100644
--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgweather
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.107 2014/04/26 06:52:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.108 2014/04/27 16:26:24 eva Exp $
+
+*libgweather-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgweather-3.12.1.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libgweather-3.10.1.ebuild,
   -libgweather-3.8.3.ebuild:
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 6a339431b031..5120a125797f 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX libgweather-2.30.0-fix-automagic-python-support.patch 838 SHA256 d6e1462c5a7d57908bb378dcec65ed8ec1bba8ac19883d67801a696b73157597 SHA512 9312d4da603b595c7a08eb908a70c1b92f1ecf901f16eeebdb17800441bb895437b48a1781dc8ca4dc840f76ddaef2da5c7fbcb500165dfe18996dcd43f10695 WHIRLPOOL e1c7022c397b3c3237c877b7a0889fdde72215cbc8cd07c0187753d6aace784aeaf07dca33c6b9cc6602aa2d6a90db0e3fed1c1412c433bcf9224d6b68caa139
 DIST libgweather-2.30.3.tar.bz2 7449487 SHA256 b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c SHA512 4cbed97a65d02dfdb015fced22cc58d681cd508473add0fc9060206e2736e2c97aa80d3a70923a6e46e0f8de566baffbd56bb86faa875fa565ae52630a05a071 WHIRLPOOL fc000d21f5772f3852f1de5eaf7ebab42f3deabc30ac1a96f12b40a2ba9c864afdf9d0fe01809cdbcd0749b9bd5e37a5c177df199bf5847b2c5ec6cf1cd9cdb0
 DIST libgweather-3.10.2.tar.xz 3970388 SHA256 454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005 SHA512 0de26323522a9902b8a4c4c0b773005543fa8fd6d639e70a89487015a4653e10aec5baa792d9475a0c10dd09d55e7417a896cea738b7274fbb740429c61b8297 WHIRLPOOL a7054bfd9a3e966cd1bf2abc6d148c3b412340c8c1b275587a2d21730d6e69f1b8b3f84e224e6e57b06eb60752c9d55db1ee49ea095a855aff26c7cb46704e3f
+DIST libgweather-3.12.1.tar.xz 3985536 SHA256 e8e3a6c5f3a6e4e128afecdc4a95e6228d3d8afdaabaf10483168621527cfba8 SHA512 c2af75fc65c64bb09f6197b4b4983419c97d421d787f3bf1f0241d131bad76a6c9cadcf7fee26942140128f5c486244787c32af3183ce961ed5000ba5223eb29 WHIRLPOOL fbe922a1381ca18fb544768d022015967103a802f7f2b86c308876ea096c1abb8d1a159b1d7ea5e64df014b6543d8da36cb6a72906263f904d485fe3bb878678
 EBUILD libgweather-2.30.3.ebuild 1658 SHA256 81c563f8aeb4555a2a6deacbc52a167dc3e8fb0befad03d200629a5f84e90d7d SHA512 ed4d691266c1f17d1eadd293c9eef9cc2591ace2ec8042c805e33bae29d46d5e8444d2d65cb2d8c3dd51c0f33b4fa3053074f78facfa2af0a3bdebf7c63513b7 WHIRLPOOL 6ca66c8aef4d4540e3d63a94e7450eb02cc50824042af405d9b44af30fd38f0300d0de463be4100fedcfcfdab5d3debc58d3026e28c053acd741ca02284728fb
 EBUILD libgweather-3.10.2.ebuild 1475 SHA256 bca8053f342a8eb22590ade692396518f511b4d9db4ddfc2fa3743edbe732e8b SHA512 8e04d5fed12cc7892430e7ee446e3e3643ab51adc33230473d77b79142791798704486c20e2a1009eedf2f19c37fa4c7bde9b2f501ef79c4667856fa6deddb19 WHIRLPOOL 7286d534dbecdc3b4577a9188c62f2c5f7cb3238e714e437120f4b62db3eea1a8a9c2a84a3f5129dcb9fc23f898a1064b0a8f8dc929b9893ce3ee10b3df54602
-MISC ChangeLog 15172 SHA256 4272247d5a744d93bc4650f03b256440dbdea56ce2b21bc4636ded6ba766136c SHA512 e30c405297030c85720b9c527a4319c8e2cd0c57f70ac3f24eb142c130357882806a8e4db7aaa52c5ca1210900995287900ca390d9ac5009dca4d59fc910a2a3 WHIRLPOOL c076cb57d32c0296d67d04d94ccbc53826825715f5b94cc222214bbf1a8bab45037b83d33d9895d5174b51a012576586c1e306a1997d9b4559cf678f8fb404c0
+EBUILD libgweather-3.12.1.ebuild 1475 SHA256 486371189318995c99afcc062047e30a5f9fbb417bd79825ea167e5b01ac6350 SHA512 c2d45a3852014a3e6cdcbb0cb7bd03ec6757e9fd65143c5f0d91cf28767ab87c9867c02305b576c41150db4939c925d4beb1b7c99084e0e8c5ef5183621f67f8 WHIRLPOOL 17030366d7e679b9eb9bf23f6fab3a54c7288353b64ed0a4dd5eaa8560a32010544809ccc88bae533865a89da3062d372f643400fcf3c1e49f2eeb221d67e64d
+MISC ChangeLog 15321 SHA256 2f5f2b61e61bab6114c5d0ce5082e75d7c63d1a33208c7d4389289cfa91ae0a6 SHA512 1b4a791e7e350f64372eacc0e5b908f3e0a8c8fb8fba2cbfe69a8e5d58f54c67a5f30df734ef5c076ca27d8ca94b529ed7d633f46876425261b6a26ef1853ad3 WHIRLPOOL 078fc07f7bd9b0e7382f852857a4f2d160141af63f2e1f5a79971c1e1f62e8d20ad409a548aa91470c57ebdc2a696ec0aa556d587a3d782c6fae1555f5b0e149
 MISC metadata.xml 255 SHA256 46fe560312c5a99fbd5a22a133b1f29a8c05a832b5d368809d39467e2a03ca00 SHA512 ba171878fa6c0faf41fcf9171e47e8a40871e57adfe816afa1aff814520af6e739a3cd48940ed9c9e99e660004e4d7c24f635b0f60b768c45f13b40a25e4bf00 WHIRLPOOL dbcd3a1f9de18ce3229431938eb17033710ada6827899a3b9e35f8bccf6eab41330c4b548e1f47764523a5be12add795b279c564c1d8698dde760b6cecc0d4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbV7gACgkQCaWpQKGI+9TlWgCfVQo3FECg7IIhEQqS73JfcjqR
-M7QAn1jFL4xj4364DkiTJKuEgn07RKu2
-=vINn
+iEYEAREIAAYFAlNdL7EACgkQ1fmVwcYIWAb7yQCeOdgxLjRT/Uv7mZ9Yb8h2VPwJ
+xQoAnAl/r08VdG8M3lHXREyFSJFplBW/
+=HkJN
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgweather/libgweather-3.12.1.ebuild b/dev-libs/libgweather/libgweather-3.12.1.ebuild
new file mode 100644
index 000000000000..6485b6737f9c
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.12.1.ebuild,v 1.1 2014/04/27 16:26:24 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library to access weather information from online services"
+HOMEPAGE="https://wiki.gnome.org/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-2.90.0:3[introspection?]
+	>=dev-libs/glib-2.35.1:2
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-applets-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 30b7231b6af7..bdd9348c6823 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.30 2014/04/26 06:54:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.31 2014/04/27 16:28:22 eva Exp $
+
+*libpeas-1.10.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +libpeas-1.10.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libpeas-1.8.1.ebuild:
   drop old
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index d7003986c266..35b445dc6521 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST libpeas-1.10.0.tar.xz 507084 SHA256 4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47 SHA512 8d992635cd27279086c3ae1940720f45432449dcba6dd17ce399b909914374408f52b547662cee739185d4d9a216eac742ddd8b0ff8bdb30ccdf38df3794b421 WHIRLPOOL 3dcd43ae6ebde1df9191373a78ff6e3f987e3e122235d1e83a947a0225e83c4e50ccdc98c6ee07f7101957e31bb7a0c2f18f6fe42edbd271663489a9a90837b9
 DIST libpeas-1.9.0.tar.xz 532364 SHA256 008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d SHA512 d00b0d78a8ee3807a3c9d48259fdfaf2e60042c385c3cccc0bcd61f76415fd9225e4ef737d48a1a0afb2c12e8418bdd3e1ceaac927a083f3180faf8acbbe79b0 WHIRLPOOL edf4555b11c3a2e522a39180068cca1811125e9761e14f7315ac97c29e39fa40c5bf1e4d3d14f3650af788baa452fc3067fc31647626cfcc471c0c729421c7cf
+EBUILD libpeas-1.10.0.ebuild 2557 SHA256 fe4aa9dbf18598dc1972d39939eaa29295239f917fe6586251a3f76594ce5ba3 SHA512 31990a46416a698f3f246adee7f14edfbc3fc89b4184608a7d2bb95dd2c5b91fbe88b4d4868341b02560a266bb3ff7cae04c5a0fdd2381da8d3ef8252871effd WHIRLPOOL af6e0070381359f45d44c73a2a3403a75777ae724eb74721779a542509d862bbefab72f0d9b9ca08a4ae18cf240cfd2ab5eadce6f2d0585ff7e6bf5d43390808
 EBUILD libpeas-1.9.0.ebuild 2640 SHA256 cf7fd1e61aefd5c948841a099d56570ee0cfdd8203d6d8b42c97db5f7a70aa7c SHA512 775b7ac8685b7759e77fb3772bfc7fdf09bb73ae413da68edee1090b83c29e7c057799250807e4a20ce9f3a2dac8db205f6b012d708d30f1977f2df52a888930 WHIRLPOOL 30d2ac650235786ce46da6f79453d33bd6f877059d28ea676a6ccb2a3c26a97edf52b8ac15ceafba6627d54243d61314ccf65488835da016793d265525d2ab88
-MISC ChangeLog 4430 SHA256 c03b32e56598c31d6b6aff86c95e8012faee85e43279274af09ffa38f5c468b9 SHA512 b78fbc7ef2473e7a5e24b6d399f42b342c4b2508107bdffd725e2aff36d6b65ff579657a3f52a0f48b2fc99024dc1f6fdd0c2aa97901be356a276680f3f1d068 WHIRLPOOL a31c3873496464d3973bfe2bf9759a810a899029b82b9e0658cc94bec960edbab5335b4efa347053647c27d7f166496935796d1355c9320974e94e5c80692a66
+MISC ChangeLog 4569 SHA256 d2b4d5260edc35a806bd09f1673c3a87de16bdfbce4434f6e2ac0b282df71b45 SHA512 81395b3014f85d60d9e6477c566f84970ea6d627185e301af03bd9c79da86abf55c5b6c4e44ebb940a9e2b9b03018079a7df86eea9251b10dadd9796021fa45c WHIRLPOOL 2474ff35c108c7bc1fc71cfe3f79400df19ec7c795f83114465ac19bc677a97437351262136325451dabad2146d33d9123c106bb2209186420aa27a1704ae601
 MISC metadata.xml 531 SHA256 51dd5faefa5c4d563cd93744c74166cd21b2fbaba1ddb8b64239c25d53962c21 SHA512 237be10858c63fd7e3c335692ca2276b3b2062b52b30de2bcc99cfbcb0fb2d059cf8facebc65a1aecd0bf9a3092c51e1cc287d35cc13f52b5b5e8d11bdbf877c WHIRLPOOL 3375f4b5fad86a6ecc774b4071c7c637a01d58ee1305210c56a5d7f5dca0b76cd183f285348366b80c202c0f5b5c42d6bd7c5c7c3d6501a414a2481e142efb48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbWD0ACgkQCaWpQKGI+9TcJwCdEHmgtrSeKXsNX95nWqoG5KsU
-SlMAniSYjZkvV6revr9XTdIxiy3hucS/
-=VQR+
+iEYEAREIAAYFAlNdMCcACgkQ1fmVwcYIWAZ8tQCg7z39Xs16F7RakqkLUSY/BgK/
+RlEAoOq9olBAFt/YQRtJ2z5ulKbRUQmy
+=CjMH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/libpeas-1.10.0.ebuild b/dev-libs/libpeas/libpeas-1.10.0.ebuild
new file mode 100644
index 000000000000..9b04210f273c
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.10.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.10.0.ebuild,v 1.1 2014/04/27 16:28:22 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+gtk glade +python seed"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.39
+	glade? ( >=dev-util/glade-3.9.1:3.10 )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
+	seed? ( >=dev-libs/seed-2.91.91 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_prepare() {
+	use python && python_copy_sources
+	if_use_python_python_foreach_impl gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable glade glade-catalog)
+		$(use_enable gtk)
+		$(use_enable seed)
+		--disable-deprecation
+		--disable-static"
+	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+	# What do we do about gdb, valgrind, gcov, etc?
+
+	configuration() {
+		local myconf="$@"
+		[[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 --disable-python3 PYTHON2_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+		[[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 --disable-python2 PYTHON3_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+		gnome2_src_configure ${myconf}
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir configuration ${myconf}
+	else
+		gnome2_src_configure ${myconf}
+	fi
+}
+
+src_compile() {
+	if_use_python_python_foreach_impl gnome2_src_compile
+}
+
+src_install() {
+	if_use_python_python_foreach_impl gnome2_src_install
+}
+
+src_test() {
+	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
+	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
+	# To reproduce:
+	# >>> from gi.repository import Gtk
+	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
+	# This should return True, it returns False for Xvfb
+	if_use_python_python_foreach_impl Xemake check
+}