Version bump for Gnome 3.10, drop old

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

23 files changed, 284 insertions, 429 deletions

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index c3dd61b1ba21..71cc1261c13f 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/folks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.36 2013/12/08 17:55:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.37 2013/12/24 15:47:09 pacho Exp $
+
+*folks-0.9.6 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +folks-0.9.6.ebuild,
+  -folks-0.8.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> folks-0.9.3.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 8cbd0d97038f..1d520a6439af 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST folks-0.4.3.tar.bz2 635168 SHA256 e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e SHA512 dfd7cb055aba691e7b8e7daa3e887e20f021d230617641c0dcf91787b53b576601fabeeba654e98009b47ecff39969ea1b560822d4452ee497c7eeedc16c423b WHIRLPOOL 49cee01e55e9223b6566d76c21f8de68a15c6a2534ce4b4d6ed752e9cf8dadd256b5343a46c26e0236155901864e34b6677764aa70c43c8e18df692c40d8c85d
-DIST folks-0.8.0.tar.xz 1477836 SHA256 8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d SHA512 0e6c1adb84ff248a0a5e93ab631ba791b493fbcc60d9f34acc6f96132fa23c8a81a84a322ae8fc8168f3dd2769f8dc944979ba03b6ec529d2ed9d12c520e89ba WHIRLPOOL 379c1a4c202bcf3550c46c67eb3b6af3171e0e58ce9639dce13b5f52154d8f002e603a23a11a7cfe601f0ea82cbb7fa8702db467be2d159c3d3694c39261ed4c
 DIST folks-0.9.3.tar.xz 1650964 SHA256 3a806f2009005c920cacd0c6415d86a52e3fbf3ad554d662cf6b4bd9209c17c5 SHA512 d338d6c026b97c3af365eca1ba85f7cc24faeb48309274d4a707813369c285eee0dd6105513f623edc98b3a762df0b1b3c092e04f27d8c04b172bcf78c3fd8cd WHIRLPOOL 7319728bd7bb25a2f2dfcaf2df48fe2c9d953342a086507dca485e651a5de7f62d696a441e03edcd648a4605a5d0e90d8a796cacd0bc0f7b90e8612f9a376598
+DIST folks-0.9.6.tar.xz 1694012 SHA256 a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f SHA512 613d4cfb84f4ce9656994950f66d974c99c074317c5f1c92f4501760261021e8e86d85e56c7720fa0f6a20db818a1e813d6cd40e67d4157fd3005a3770a86127 WHIRLPOOL ae564d02ec3bea7efca04bd9a0f77732fdc03217538d1cb410bf7c467cca606adcf8bc395d7f8f4ed386eb07e687203889b75c930a8103dc104ce2ce1afb0d94
 EBUILD folks-0.4.3.ebuild 1262 SHA256 e685df940a335fa5620fde997158a10ab4b33163d85b84c29d8f1aabb9d5004b SHA512 f3306604f1e852af4739ddaa8cfe3b0f30c7920ca018aa7c9e334f608a5a4d7c4a32e589e4082a0fbf8f6275b26e2351bc62555960e507dfd00f0e97f60ee5c2 WHIRLPOOL 13ed9ea89d2be87005884ecad979d4e0a242b9cf8619bfb1638d4b5f25b7bfc3246d8d08ba48bbd3add6c07e11dd31ce2d08be6cd6945f9695507ef5d6ce413e
-EBUILD folks-0.8.0.ebuild 2597 SHA256 7f7b1cf6cca236a9a087d5e65e7f32e979b6144c6e2c92703a4cc0faa2d31695 SHA512 4ce9920dc68cbf4e9cae754ebff8c678573493eae1201474f968b3027402891d22d31e59d7261129def9594e559b70f492e62346751450b0f543ad491872809e WHIRLPOOL 7585456d73537d78e4b16c7ea36cc0b96212a8dac398d9bdf8b35b5004196d773e9a5153ff6e1b49fbd5855412b6068dfeffbe937ed85f56773240fe75eda271
 EBUILD folks-0.9.3.ebuild 2411 SHA256 2a272c856df29c5220ee02389e686a4c56cdc94e68c6d3f9f6e04ab90880d638 SHA512 b5f951d66a88a7ff522e2128a584b8608bee036c22f439927470e5b8dbc24dfb6c8dd23591c97fabd13fc1dad1f76b996a3a63258cde1e5df353ad44afcf2a96 WHIRLPOOL cb9b5ff26ee4a5a48c737b6479dd832c56ce6eaf10d8c762da6a9e3afd1cd28329c18f71a0f55f4edf9d1714738d9437a5730de0471cf1e04c9294b8fc4e22af
-MISC ChangeLog 5600 SHA256 2fc73d8f44b9a05e9720cff48034e79312adef30231a3b2c2524c7e80523c493 SHA512 d689cada4d6eed4773bc378b5b5807c31cfa70e4cd7100a800e1061306ea92461e84be1789fb14929655baa7230af03029b2e0f5d82809331e2ff7ccba09780c WHIRLPOOL ec2e81780b1b5315f2dde3c591107cb28eafe7f159dacbe392d8abb9c8bebc6f2a97fa00832abfcd8bcf6d0a7bbeecae9203cf68bbd61b78a5a7db4f0195c851
-MISC metadata.xml 636 SHA256 20d8ab0e35f35e6d91d1b8cdc1b3c3d47a1f150cf5ea54512ce88d035604e6d4 SHA512 589e36d5ff423f04e561762f7c3ff240c5953b777ceab6f51ce0f3b6f130f172c687c538dca90575b22e71174ef4634338afd6a2ba9e71dd5ff1503775a828d9 WHIRLPOOL 1186c45e28c71076fd2faf927d4cade2d6d828486eef1791f366fcb7ed87f76bee2384028126c0ca1c493c7396cf526652e19e7e5d584dd08bff66c1ab62ecd6
+EBUILD folks-0.9.6.ebuild 2446 SHA256 1ff3d0d79e2d35bb375b7321e7301bbd87c58f01c97a198409a7fec435e4daa4 SHA512 9324bc46a6e18bc3c73baeae0916c8859eba6318f0559abb50b725a0da173e8266703a7df79952e2862c27cac22b9a6969f85bc9d730a2687d2af986d231ff60 WHIRLPOOL 2bbbe3fc83632c607050463121f192197943df9509990c5fe5e563baf1de0c065b4a54e6839138007179fa009786ea548b177cd86df29363b5f2047299e8b8f1
+MISC ChangeLog 5773 SHA256 715189977d849b7133400ebefaced59da1f3c2e05072b3e28f77764e908950bb SHA512 140cfa861f0942dc1a901a68b42b6c684d491e07e3c6c56baebe536486721dce4d8176b936e1b76ae9286af93a6fafc08d8edc2962bdc6c52dde1382aa3f8580 WHIRLPOOL ddea36b7aaad686205079fd8a6184d23724e0b7038072d0c51319ee48b3ab56c0f8e2b3688850867ff6b43f8f306b107650753f8417987d144473969d1598112
+MISC metadata.xml 561 SHA256 c39078a098dc01eb77baa80485700f14a684a9379f256efa7143f79144b189bc SHA512 a2b01fd5035b0f290b1e066d2b1577ebcd604f1cdb318958c5684ca38ea5ad73b0384141b7ed7ff9ed86779b26a1d9d09365586cc21166a03e5c5406ecdc8d89 WHIRLPOOL 8e1eebfa1ed4e915886bd472203f48ab78f2f7d6eab9ee6ce29cb0f8f600013699beb38970eab2f64b8660b8005c2c48b81d00592c73ab1c81e550c6bf2f899a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKksqYACgkQCaWpQKGI+9TS4QCghByjf75QGJOBnvki+HmoQFY4
-VIsAn3+basvX3sD4e7Sd66C7qDcZCyN0
-=REOM
+iEYEAREIAAYFAlK5rH4ACgkQCaWpQKGI+9SaSgCghE5Y4vpOZaCDRj63Jw9tP2BE
+ZFAAnRyGCusuQ7hETD7bBAxPO3vzegVH
+=ttYr
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/folks/folks-0.8.0.ebuild b/dev-libs/folks/folks-0.8.0.ebuild
deleted file mode 100644
index 81692c6fc900..000000000000
--- a/dev-libs/folks/folks-0.8.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.8.0.ebuild,v 1.5 2013/02/02 22:24:49 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala virtualx
-
-DESCRIPTION="libfolks is a library that aggregates people from multiple sources"
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-# TODO: --enable-profiling
-IUSE="eds socialweb +telepathy test tracker utils vala"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/dbus-glib
-	<dev-libs/libgee-0.7:0[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-
-	eds? ( >=gnome-extra/evolution-data-server-3.5.4:= )
-	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? (
-		>=dev-libs/libzeitgeist-0.3.14:=
-		>=net-libs/telepathy-glib-0.19 )
-	tracker? ( >=app-misc/tracker-0.14:= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/gobject-introspection-1.30
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
-	test? ( sys-apps/dbus )
-	vala? (
-		$(vala_depend)
-		>=net-libs/telepathy-glib-0.13.1[vala]
-		eds? ( >=gnome-extra/evolution-data-server-3.5.4:=[vala] ) )
-"
-# the inspect tool requires --enable-vala
-REQUIRED_USE="utils? ( vala )"
-
-src_prepare() {
-	local vala_version=$(vala_best_api_version)
-	# Rebuilding docs needs valadoc, which has no release
-	G2CONF="${G2CONF}
-		$(use_enable eds eds-backend)
-		$(use_enable socialweb libsocialweb-backend)
-		$(use_enable telepathy telepathy-backend)
-		$(use_enable tracker tracker-backend)
-		$(use_enable utils inspect-tool)
-		$(use_enable vala)
-		$(use_enable test tests)
-		--enable-import-tool
-		--disable-docs
-		--disable-fatal-warnings
-		VALAC=$(type -p valac-${vala_version})
-		VAPIGEN=$(type -p vapigen-${vala_version})"
-
-	# We don't need vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: eds tests often fails for no good reason
-	#sed -e 's/check: .*/check: /' \
-	#	-i tests/eds/Makefile || die "sed failed"
-	dbus-launch Xemake check
-}
diff --git a/dev-libs/folks/folks-0.9.6.ebuild b/dev-libs/folks/folks-0.9.6.ebuild
new file mode 100644
index 000000000000..f4845cfda613
--- /dev/null
+++ b/dev-libs/folks/folks-0.9.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.6.ebuild,v 1.1 2013/12/24 15:47:09 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://live.gnome.org/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+# TODO: --enable-profiling
+# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
+IUSE="bluetooth eds socialweb +telepathy test tracker utils zeitgeist"
+REQUIRED_USE="bluetooth? ( eds )"
+
+COMMON_DEPEND="
+	$(vala_depend)
+	>=dev-libs/glib-2.38.2:2
+	dev-libs/dbus-glib
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	dev-libs/libxml2
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	bluetooth? ( >=net-wireless/bluez-5 )
+	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
+	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${COMMON_DEPEND}
+	net-im/telepathy-mission-control
+"
+# folks socialweb backend requires that libsocialweb be built with USE=vala,
+# even when building folks with --disable-vala.
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/gobject-introspection-1.30
+	>=dev-util/intltool-0.50.0
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
+	test? ( sys-apps/dbus )
+	!<dev-lang/vala-0.22.1:0.22
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Rebuilding docs needs valadoc, which has no release
+	gnome2_src_configure \
+		$(use_enable bluetooth bluez-backend) \
+		$(use_enable eds eds-backend) \
+		$(use_enable eds ofono-backend) \
+		$(use_enable socialweb libsocialweb-backend) \
+		$(use_enable telepathy telepathy-backend) \
+		$(use_enable tracker tracker-backend) \
+		$(use_enable utils inspect-tool) \
+		$(use_enable test tests) \
+		$(use_enable zeitgeist) \
+		--enable-vala \
+		--enable-import-tool \
+		--disable-docs \
+		--disable-fatal-warnings
+}
+
+src_test() {
+	dbus-launch Xemake check
+}
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index 1742780aad9f..5a4e0a796e42 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -7,7 +7,6 @@
 	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
 	<flag name="utils">Build the folks-inspect utility</flag>
-	<flag name="vala">Regenerate pre-generated C code from Vala source</flag>
 	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/gdl/ChangeLog b/dev-libs/gdl/ChangeLog
index f71188abc35f..700330071d20 100644
--- a/dev-libs/gdl/ChangeLog
+++ b/dev-libs/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gdl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.97 2013/12/22 15:49:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.98 2013/12/24 15:44:57 pacho Exp $
+
+*gdl-3.10.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gdl-3.10.0.ebuild,
+  -gdl-3.4.2.ebuild, -gdl-3.8.0.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org> gdl-3.8.1.ebuild:
   Stable for HPPA (bug #478252).
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 052b82907d44..305aba3e342b 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA256
 
 DIST gdl-2.30.1.tar.bz2 569211 SHA256 027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1 SHA512 80f55a84a29a76fb79f99982c92258f6d02f27a7476b1b9d6ddc7554ac6eb2ad475e88066ce16ed9c48191c5f5150bbb1db22b35efd53502f12441ccaa90f00b WHIRLPOOL 0b4ca437f2d7a6b1e922f5587ae464ca1d77d7df92a35837bceaffa47681464e91213a0f5d8251144f3100ca1464e139542479345132c8bc7bb32106108d8da9
-DIST gdl-3.4.2.tar.xz 522816 SHA256 66eeca8aa8e7205abf38911a9eadfbd288967f92388682bd62942ed4f1db4906 SHA512 cf48cdcd867548d457f485a644834edea59a725dbf08aa985a9884eeee96d16cf97e98bfe6b80ebfeabfc36c799a0ca9d7b840362efe0a523913dfbaf09c46c3 WHIRLPOOL e64de6ad60673dfcd1daad9ebf1b83c7969bdec0eca3a5588b76f5b1b91f56c884fa899f7053cc96e481fd9541d23440b98803eda898e270499fb1a8f1b353fa
+DIST gdl-3.10.0.tar.xz 526704 SHA256 4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760 SHA512 0df36abc91d1bb9fb2cdfc2eea0c755fbe406693b6e848350b0297fb96fac3f1932c6804b2c240140ba88529b69c229a6fc3446f67bd7686f32b8918916d4943 WHIRLPOOL 05ea5ce442b5a3579366f4b15b43778d67edd1e3e18a6098c1b0a28ef1505cdff8b223241f3ec8f1b01dc455da58e419e8b395041c7ec4965a11b349e1cb6994
 DIST gdl-3.6.2.tar.xz 530604 SHA256 e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c SHA512 6a0fb558550e4e1a5e1bf689f5c28b13bb99c476c8b1837ab22d8184c23e11589e809ae1846dac5ba07550e943db614d367b605a0fc4ee3bdbb20572a1f89d80 WHIRLPOOL acda2a8b31417818ce71d98e4ea1ecf5ac6d0fcc31cd0d2ccb54a1865fe0cc19d5a93a4c0e63d455bd7254e4622ae04dd4f822eaf45d05ac279bc398921d6bfc
-DIST gdl-3.8.0.tar.xz 523488 SHA256 d29aeae9582d6af1f9f1cf86a5248ba741770ae0078991e133f4e360f1e6c0e6 SHA512 38ad3183ab4fc94948cdef2d0dd902c265eed7f35359e68bd9cc4dda39e17bebbee5ed1f8e45fc86a6c5daa9257b69d0ac9f1b0128d66831e6fcff828868d906 WHIRLPOOL 9664ca172f77090a34a0b65af90fac59c328176030fa2f3992eddaca6c77a5659f3caabff6d29ac413b0f5c41d9336ff52578598cc2799e1e04b341ab19432fa
 DIST gdl-3.8.1.tar.xz 523888 SHA256 c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb SHA512 0a16b577249b0f02da4f04ebd817bd3f9efe18aed4cfd17932e62aab991fbcdc4f7687fd67d39d2a5f12796fc1d5248aa6dbe1b362cb9c450fe8eca7b1650ddd WHIRLPOOL 0adb75dced72708d811460ced6940fded44a9ff6546c7f51d2480afd27e1ceda659fac423101b1cacb544c013213e6ff6bea87a713b1aa12c248910788aaf3e7
 EBUILD gdl-2.30.1.ebuild 789 SHA256 306776d03bca082c4d33c9d2b00e88e09b817179f812dc63e066d17f4265ca34 SHA512 bd4f48c5906a461633a70df5e9520df6b99cea9567a7bfac5aa61e99ef8ca6512ba5d81a2ae457d6019720d9e5703d2d58cbfe05e90e7a6c1b7f90ea076bfca8 WHIRLPOOL f2417093cbff34149a7e82565b5e138915fcd66e6a39f92e7f419fc5821ff0497fc16c2283acbb333ab95e4b39c29e3d59965b5a1501fab09868eeb871692b99
-EBUILD gdl-3.4.2.ebuild 885 SHA256 f4cc60e987a74d92dfb466deb4a943f1b526680ff0dbcb102b5c7472765f13e7 SHA512 b0191d511149a459eca22e51774cc47d70e712fba158e54643d7d63bb8207b376aa761bc3c354b7adbd82a75fca230e737698b4178af0a2d1708ea2331575c22 WHIRLPOOL eb86c8082541267517e26b16a9cf48eb844a1ba018ce820c1d5762fd5331d8538cad08d10864250c1180630a30056cf141f2c835b1cfe5733adc76e7da7bf84d
+EBUILD gdl-3.10.0.ebuild 874 SHA256 62740654bf2f2bec8b0aec956ea95eabf4ad5359637f20f631b8abe4ebc052be SHA512 1419936ba42082876966be2ed996cc7ccb8b254a11b9bb4d908fcf7eeaa9a374211c8d60641c11ebc371c24d54936a0b4828460aea5223aefb388368d477b39d WHIRLPOOL ee77964e7d23b6b8aabe7527e03d6fab4bbbb33dfe83e8470eeb0956240b2f805a4e2ebdd638e9438bf1274b3467ed281116870210001097c208f1e1e02bd02d
 EBUILD gdl-3.6.2.ebuild 859 SHA256 c709bb2f08df43dfac94700b59fd650ffe3e555b59119e726b0c2555d50fc2ee SHA512 dd8732570314b6ddc2cc3beb376e441ed9e3d8b84781cfef1ed4dd3e04533bdaa772152904a5a5faaf4f9e79bb1ef5735251c4b2b52d4c68ef2c2a20a44fba13 WHIRLPOOL 65c88da42fae8d102601ad5d5b2505ebeb688dd84340ea19b13cac657e27793fd8963254dabf2efac41545d39222e77d562016166126a725ebd173c4c74e8477
-EBUILD gdl-3.8.0.ebuild 824 SHA256 b7c53522e58e66257d71f70fde2d163502319e27e08989a80d751e4cf0d957ce SHA512 d4325516d66339c669b9102897edbdf4256675c4a0f37a3457112adc8ce80e2421ced3ae3bd6057aa5d01b22ec9aa13eb5b6af8b7a0ca96e5afd228440cd8862 WHIRLPOOL 39a7cd9ba7f5029d01d479b32df8d4e0fe4f20a880dd859caa781ef4d21b8fd049f96dde718e55c8c82ec06b899b30f03378421121f2eb5782e5a234cbe8664f
 EBUILD gdl-3.8.1.ebuild 832 SHA256 aba60cc71ec065affedf0ba854df6b9693ea3b3cf18cd9f7eba168b74680ca7f SHA512 f85e418805a966cb975e915ff79983e7db2c8aa9c3689b068d815b68bdd829f9e209da356e3b40d229152146549c0c8ca2097542c0b5338a332a74901cb2f13e WHIRLPOOL f50e55354f54918387531387f30140ea40b08d355c04e54437c72a2e141dbca0db981eaca142cbae4c69be90b83744b408505307a8b35eca4f1e2bcdcac2304c
-MISC ChangeLog 12085 SHA256 7c8a623097b8a500692361a005ae1859831fbe77d8d94cf99232cb4cc01049ca SHA512 1adc291b448e4db74357a7bc2241729f8403f0fc09843d71dbe7f53fee276b6f00f02c3ce3a82232004f7b0653a4d45b7ba78de21810c4e2bb1976f8343f2aef WHIRLPOOL cfbd283eb096632f544601befa1899f63e44b5cae27c46f38d5632ab3cc01e49388614b030478ce21df84f9ba27c405808a9fea95fc73e55017fa6b9cf9361ed
+MISC ChangeLog 12261 SHA256 03902454a44f0a908a5854d250fc76ccc10a8784e48989321689b32e133b8ec4 SHA512 d159501d62e3d2f1d37dbac01771169e5bbd24cd5e76660da0765223d684aab7dffc7dc389a86de437970168016da39df3e8d254190e96d39fa8b7a24e618215 WHIRLPOOL e15284cf01223d0ab3221cc151140f6ff6eaf9af4a1be29be77274d733252a3e6bb14139bb0e9f3afccc510f71dd675e11b3b61b57103d6b14c0c3db10a220dd
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3ChEACgkQVWmRsqeSphO66ACeM3PnNgaMa69uO8dPJPHkG3A8
-TeEAn12qYZxEEf40FBdQHgPju4xpcubC
-=NZIQ
+iEYEAREIAAYFAlK5q/oACgkQCaWpQKGI+9SB/gCfbGddXklswHuDHgWt0kcceRBD
+viYAn1oxw3nOY9YSlK3IJWzm8/T7QR3D
+=wEo1
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gdl/gdl-3.8.0.ebuild b/dev-libs/gdl/gdl-3.10.0.ebuild
index 77a11427e1bb..1e65b6de945b 100644
--- a/dev-libs/gdl/gdl-3.8.0.ebuild
+++ b/dev-libs/gdl/gdl-3.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.8.0.ebuild,v 1.2 2013/04/07 21:48:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.10.0.ebuild,v 1.1 2013/12/24 15:44:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="GNOME docking library"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://developer.gnome.org/gdl/"
 
 LICENSE="LGPL-2.1+"
-SLOT="3/5"
+SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
diff --git a/dev-libs/gdl/gdl-3.4.2.ebuild b/dev-libs/gdl/gdl-3.4.2.ebuild
deleted file mode 100644
index 28fcc29aa404..000000000000
--- a/dev-libs/gdl/gdl-3.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.4.2.ebuild,v 1.9 2012/12/17 06:25:18 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME docking library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+introspection"
-
-RDEPEND="dev-libs/glib:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.4:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	gnome2_src_configure
-}
diff --git a/dev-libs/gjs/ChangeLog b/dev-libs/gjs/ChangeLog
index cde8c6787d29..7c31a51a9c52 100644
--- a/dev-libs/gjs/ChangeLog
+++ b/dev-libs/gjs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gjs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.25 2013/12/08 17:57:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.26 2013/12/24 15:50:24 pacho Exp $
+
+*gjs-1.38.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gjs-1.38.1.ebuild,
+  -gjs-1.34.0-r1.ebuild, -gjs-1.34.0.ebuild, -gjs-1.36.0.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gjs-1.36.1.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 4e2a214a648e..13b29ddb14e0 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gjs-1.34.0.tar.xz 474004 SHA256 3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb SHA512 938134f25f07e7cb9267f0f44944841d93143a3403cf002fc8393a342140b52b6540edfe90e5e0e1f10b40486914535ba6d57bb7c6e9f34ded11cde327293e1d WHIRLPOOL 53f11d800e69ea24b62b7f719118783fa0e397c807ee032baac3485031ae6627e20f7aa7b54fcc9cc850c0041e2b256fac5d076893d4ae5b784aa89b92508432
-DIST gjs-1.36.0.tar.xz 421836 SHA256 c55680d861d562f89171640c66e5d9ac4cb0c35f1af2495e2f45bbe494b983ca SHA512 d46659659e126de7c1b28ea8c6ace3adbe101e25e519ef93b56ab09c214477eacc915348cd7fc5aadc7bf841d7efdff67428efa3598927fc0a5c4f4e1d1ec20e WHIRLPOOL 17e2321ab67b6bc8715afb9bc6c54ccc60a6b4c4381815cec1e9ceae59c5231a7840330c7f034960181c9773fe3d86213868ceb0a14fee4230d25e49f9c2b79f
 DIST gjs-1.36.1.tar.xz 404664 SHA256 d259ef2d702fa9cc9948a35d0e701706d90798fd2855657b7e9ddc9a44dfcf87 SHA512 a2110d957f4179927d649b1da712bec7cc19cfeca48093712b7b3e8d81c06ae39752e2cbdec392c05d74343c98259af4b8c9f54448933e7e6143d9f963cfdd89 WHIRLPOOL 02676a5689d01a416775bd3cae50764f045f924c13024e289bc830ce38474585b4868aa758c5584ae715d2fba1422f6db7a92b2e5852117cb2711959d8ae6f0c
-EBUILD gjs-1.34.0-r1.ebuild 1600 SHA256 a813fdf03fdc5d3fe152851665dc47b0e4c6493deef48a6f7cf61602fe691540 SHA512 e97e96e92c593d33a00e2239809e9ea3d1d842376064e815bd491d81b3103084273c97a3033b87d26a03cab63aede62e20cd234884afe11b203e14d45170add7 WHIRLPOOL 42fbb264cc2c72f8902fca00a11e59b8cf3840c8f2757080e5941b5a404035cd0d821ab446d1232f5d317ae60bd9d88da514aa0cf83ddf30385e8a3715448b83
-EBUILD gjs-1.34.0.ebuild 1632 SHA256 cc585537c2708aea5362a8df064add65c32deefa54c9750911142acf43cf707f SHA512 31d07f4c6b9f993f0ad6e671c0f7ea93d6322cfde08072846f9b2c1165e30144120a9c404ad8b0133b9d346b61be7173a56c4f1ee8d8a37a43dc3185d06d1a96 WHIRLPOOL e59882bc5746f0134fdbbd1a57634a8491148e99d785c7e2a070fb2fa0dddd08fc7c2b4b26abc72c218492f73d1c152824bed4142918114543bb27ef09b6ef37
-EBUILD gjs-1.36.0.ebuild 1475 SHA256 abf60c82b6e868a9722493cf03fe3afce406150e332411197780b2c8ba19a950 SHA512 eb1f15402036b63561cc9b09658fae87ad0195f9c9a7be610b6ec33047066c00b40b5572eb477b6cc04503f37d245268237cd712a673ce5a87354e7c15712f3c WHIRLPOOL 38782d2179eb37d66fab28f536a49ac424e286fcb6df92c677f254e658f3e5be7c89161f9a80e505ec6d7c16a1975ab5c27dfcd7034ba3d2dc345554d91242af
+DIST gjs-1.38.1.tar.xz 421160 SHA256 6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176 SHA512 2747c3803a1508c065d4c57ccd8a44e50ef4149393b89e88a2ece97e10b3f0e831c041a2d5b198c1eea25146d7252b4f221703b0145d8181ff591d25ab7e5512 WHIRLPOOL 5d052cc072b8c24807c5445665cde5942972b34f3345f7d0f99e09d9c018df34f64243a85215fb287762e08f11cc36fa9e4e4746c55dbd5e3cbe20cecfaa3c6d
 EBUILD gjs-1.36.1.ebuild 1483 SHA256 102f68f651329c453b1fc88169d5a29beb8631d4c4dad54309857ab293649261 SHA512 6996b50d4b482e7d9adba6d9f561b976203a0bd553b4814700fa2c993ec7ce49aa29b9326c0b18e2d2bb768339b26d0c825529291c34a567c9d1c062ff5a0d73 WHIRLPOOL 9e3318aae17e7049e418377b5ccbb9d776c7b698dab8571c3fe9debf82003efe4da732d9cc192457b6faaa87348124ad45e5f7593b03fb9304593aba74882783
-MISC ChangeLog 3501 SHA256 04e2826dad523433ade21b22dc8e4acc2d02dc4c5fc59753e488a8771bb6f580 SHA512 1129644f6e5b563ff790ff70a77ae46c53db4d258ab04967fd1ad88e1121726351aad18138eb7884eafc4948401db07a029d3071b71072a2fbdc6b8cb3938830 WHIRLPOOL 5e4ac30682efe853df2c640d2a2526de0c229e403afa5fc86511d7cec1826b9f1da26263475c68b199532fa07aa7334c4c2c8d20f79bc1ca84594f356db01e61
+EBUILD gjs-1.38.1.ebuild 1540 SHA256 3f296ccc48f4c53c07caf1e4d0ffcf85af072edc914b91b74694a4f87f465e52 SHA512 1b4cbd3cf5ea17950af4bacaad16f30ea1e39572455cd468896e0eb4bae7c4b4409785237fb771c4de762a7c6637656fc18be7d87bdf57cac994fe81b28e74e5 WHIRLPOOL 1983a59abe312d4dc7256cff4077a6815a66755fda2bcbbcac8f54317ff6c1f05a9af73af8afbf58c3b78385f1c5222fd96a3b7cd1a190e49f15defc268304d8
+MISC ChangeLog 3700 SHA256 b2d7c03b3ef228ff405471001c55d14b3109eeaa75b785c03095582b8bf37d21 SHA512 eeba0d015a07db98b1aa923d46f032a0ce9c3a709391c6b3f0a0a03145fd71957aa7a67612c32806af4ca05dc5b46e1f0b4b3e310141047b29ad7fd34c897dd3 WHIRLPOOL 3902ef862286904161249d8bcd94dd345766883f4ca2d5b403bdee12968eeb0c7453f4b5331edea051a313aee14d116c9aeb41086e1b87fdaf8b11e79340e538
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKksu8ACgkQCaWpQKGI+9QmzgCcD8+w4JLqB6axra7rtxBwky6t
-dtQAnjk9YqTTDxP0iNu2OyHZEe7SN514
-=OhAA
+iEYEAREIAAYFAlK5rUEACgkQCaWpQKGI+9T7VACbBYC8VyYo45Oo4j7U7hNFGe8Z
+4sgAn08EVLDWPTkdO8d35urUDNqd0dTl
+=ZA8U
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gjs/gjs-1.34.0.ebuild b/dev-libs/gjs/gjs-1.34.0.ebuild
deleted file mode 100644
index e32cd8885a0b..000000000000
--- a/dev-libs/gjs/gjs-1.34.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.34.0.ebuild,v 1.7 2013/08/09 13:53:18 axs Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
-
-inherit gnome2 pax-utils python virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="http://live.gnome.org/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="examples test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.33.10
-
-	dev-libs/dbus-glib
-	sys-libs/readline
-	x11-libs/cairo
-	>=dev-lang/spidermonkey-1.8.5:0
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	# 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
-	G2CONF="${G2CONF}
-		--disable-systemtap
-		--disable-dtrace
-		--disable-coverage
-		$(use_enable test tests)"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs 2 "${S}"/scripts/make-tests
-}
-
-src_test() {
-	# Tests need dbus
-	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/gjs/gjs-1.36.0.ebuild b/dev-libs/gjs/gjs-1.36.0.ebuild
deleted file mode 100644
index 07385337f357..000000000000
--- a/dev-libs/gjs/gjs-1.36.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.36.0.ebuild,v 1.2 2013/08/09 13:53:18 axs 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"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-RDEPEND=">=dev-libs/glib-2.36.0:2
-	>=dev-libs/gobject-introspection-1.36.0
-
-	dev-libs/dbus-glib
-	sys-libs/readline
-	>=dev-lang/spidermonkey-1.8.5:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-
-	# 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)
-}
-
-src_test() {
-	# Tests need dbus
-	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/gjs/gjs-1.34.0-r1.ebuild b/dev-libs/gjs/gjs-1.38.1.ebuild
index 237fe36056f7..281e9ae373af 100644
--- a/dev-libs/gjs/gjs-1.34.0-r1.ebuild
+++ b/dev-libs/gjs/gjs-1.38.1.ebuild
@@ -1,45 +1,44 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.34.0-r1.ebuild,v 1.2 2013/10/17 20:36:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.38.1.ebuild,v 1.1 2013/12/24 15:50:24 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 pax-utils python-any-r1 virtualx
+inherit autotools eutils 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="examples test"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+cairo examples test"
+KEYWORDS=" ~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.33.10
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.38
 
-	dev-libs/dbus-glib
 	sys-libs/readline
-	x11-libs/cairo
-	>=dev-lang/spidermonkey-1.8.5:0
+	dev-lang/spidermonkey:17
 	virtual/libffi
+	cairo? ( x11-libs/cairo )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	sys-devel/gettext
 	virtual/pkgconfig
+	test? ( sys-apps/dbus )
 "
 
-pkg_setup() {
-	python-any-r1_pkg_setup
+src_prepare() {
+	# From master/1.39
+	epatch "${FILESDIR}/${PN}-1.38.1-fix-unittests.patch"
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_configure() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-
 	# 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
@@ -47,11 +46,10 @@ src_configure() {
 		--disable-systemtap \
 		--disable-dtrace \
 		--disable-coverage \
-		$(use_enable test tests)
+		$(use_with cairo cairo)
 }
 
 src_test() {
-	# Tests need dbus
 	Xemake check
 }
 
diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog
index 981e04affd61..705f4d3ceba6 100644
--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgweather
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.100 2013/12/08 18:04:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.101 2013/12/24 15:54:19 pacho Exp $
+
+*libgweather-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +libgweather-3.10.1.ebuild,
+  -libgweather-3.6.2.ebuild, -libgweather-3.8.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libgweather-3.8.3.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 818cfb500f93..dd78b586b647 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -3,19 +3,17 @@ 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.6.2.tar.xz 3896016 SHA256 0f2aeff290751590ca51e806c3d09054bf87b86b63b89f5179043a9b3fa8a0b0 SHA512 3bcfaa764ff4179811e1849a993385a5e0a0989558b721f153db7c9b0b9ba8b176f2fc9be94f7f890527ff51fef411e356ec0244f73d492b5f31b5a7899cd7d9 WHIRLPOOL 365845febbe94a88330ce7862a2375e693c058c6029ece63d018d83045ac246f8746084d024d8084a7a02b5cc08d0ba0679b969ef4a43790a15b30877b338f8f
-DIST libgweather-3.8.2.tar.xz 3859256 SHA256 b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5 SHA512 9f5df0f8164f602da4722c101bb01dbacb0c05d97f8b4036e62124e940a41086785a0f904ce1fb929e81b9c03adeffc0a96985507ec034dcf7eaf3d49b52d15f WHIRLPOOL 072c34e0f050f57ecfbaf58957a15b3a5e99d9bfedab14da2243c0c13683924baab753ee47cc5a99addfe85f6824ac0c127f9a284e5304933967fc4a17e87e8a
+DIST libgweather-3.10.1.tar.xz 3956132 SHA256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7 SHA512 6468abc20dff44d1116d7f17534a97933762a1fb1818f443b23dc0265d520a08a68eb3e82e89fc11d01a1fbc8b38cf797c0822b6752a3643fd6a0374601a6bc1 WHIRLPOOL 1f82ff43f875346337a1e7a5ab8ba9216269d5dd71e27bb8cd2b706d8d2f1f89c324e8931d6989fc61ab33bf27ef62592673f0ce3defabb896be25cedf452753
 DIST libgweather-3.8.3.tar.xz 3860628 SHA256 3ecf2666389de2bff6a69976470f7cbdfbac2e774ecf8fe47f60832788cf11c0 SHA512 78b61745b8991c4124066e94796e070eb2aa8256889911f997363f5baddc84c54183d7b9dc19e2f7e5fbc61623f96ea8064dbe22d349314ffa663f0d8a454213 WHIRLPOOL 71443b32dba75055995fe127236fb1823aec5434168ceb5a6f80fd1dcf03ba0e8620bf3e17bc14d4c7e02925ecc77ca61c981d1a6db760ccc39337e5dc2bfc6e
 EBUILD libgweather-2.30.3.ebuild 1658 SHA256 81c563f8aeb4555a2a6deacbc52a167dc3e8fb0befad03d200629a5f84e90d7d SHA512 ed4d691266c1f17d1eadd293c9eef9cc2591ace2ec8042c805e33bae29d46d5e8444d2d65cb2d8c3dd51c0f33b4fa3053074f78facfa2af0a3bdebf7c63513b7 WHIRLPOOL 6ca66c8aef4d4540e3d63a94e7450eb02cc50824042af405d9b44af30fd38f0300d0de463be4100fedcfcfdab5d3debc58d3026e28c053acd741ca02284728fb
-EBUILD libgweather-3.6.2.ebuild 1302 SHA256 4df1bd8cf0891239d3485e51ca8f1e72aeb09519b765fe8827f796579b8b876d SHA512 81a372c361a6c8d37cf885cc18b4b6202a14fec83189d79f4aa8ef029c5fc1ff31be32d514bdacbd5c4946383e07cb775bfeb060b4e9a2850bcd4cddd85b58a5 WHIRLPOOL d80cff43722c59143b396c2970214aae5155f463233fd865db4cbcc0e874df42d89a531aa1b31ca62c1e2211afaccc98a931b789e9c0016df4342e6bf29c3348
-EBUILD libgweather-3.8.2.ebuild 1272 SHA256 fe0f39b0ded8378465c95d61d576b42efa17cb6655ba4b46ef14f93289c5bf46 SHA512 61ace9a658bcfe242fa9758fbc8682916d5f34abce8b09d6c11571e59aa254d2a01932f709131a2391f3d775eedbefa953247482ea1503e5421281524a55afd5 WHIRLPOOL c6fb25451e975543e1158633c0c0890fca79f8964fd60541633b1cd2c2184f23f4696e09db9a05998189b0bf9bde35044dd2a8ae749e6830dc0838f5a2ec608d
+EBUILD libgweather-3.10.1.ebuild 1477 SHA256 56755d6f9e7fa9a171e91d2c5fcc467af6faf49ab7691c40a5fa05d87b17609c SHA512 d05f948a401be26580086dba04b6f2c05fa5417df60a85e031ed4229cdd606a1af28bcc4ed207e85f3bf2da57304ee9459dd4ea3a8b9d11ad6934df6e8b5ef31 WHIRLPOOL 70491722e6c2b8a18388e0a62ebc35af067ec4e75da2509022f4d0c0c036ffdad8e46d358c41d5060a7f0f2c6c6a810a30bb0c60ff82f643d2db136160d7a784
 EBUILD libgweather-3.8.3.ebuild 1272 SHA256 d561c55cf3797317b97c05ba1861300707dd87071b43f066aa3bb83ba05f9df3 SHA512 ea92d4f7a1f2a2efce1616fb8a83355d0894e6d04a9bf1fbd5717bb65611aa3785faff3f94d748950037687e9cd587d904b33483a379eaa54eebd767c364e5d8 WHIRLPOOL aa4aff9713c995b726c436dc1a163498b179ebed80ee9e7948b990869a90f2387c0ab1d98279bf88c72f17252fe4c1dadb73224a28103c01c1c5c332b18770bb
-MISC ChangeLog 14243 SHA256 2b09665be781c281cad066e435ca90083f54747295d787780d9a0ccf4ef3e123 SHA512 e080ea67ef002c98b93eb873ae5777510eba4eac583b658de56649fad68fbeb7375198e88139025be85a6beef05479bb9c7d87424236e68128e9dcd9227bbda2 WHIRLPOOL d4f8d0a24691b7ab802a3b9493d1b4e5122b9eb6c5ff52da92656e07182e886cc1c88f201c20540dc27b75895e7db0eeb1530e1b23bb4acbf0654e214aa1db7b
-MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
+MISC ChangeLog 14463 SHA256 db983574dfddf6e73deb17c51d94ff1ee73802bfc535b465705be4245515efa4 SHA512 dde53a0a24d0dbb2672af0f5556ec3cc5752413f1c410eef06e5235718db93efdf2ceda34ea2c2a7639a554709449871109c19a7e3e0300f99c6bb94602006e0 WHIRLPOOL 3a744798a20d97f97c9a62a3a777b6c7075d1b6eb015227929143913eb2fd3deb2f2275ec21bccc3a5cc511f227ec275a34dff42e60e57d540456fa4c0985b58
+MISC metadata.xml 255 SHA256 46fe560312c5a99fbd5a22a133b1f29a8c05a832b5d368809d39467e2a03ca00 SHA512 ba171878fa6c0faf41fcf9171e47e8a40871e57adfe816afa1aff814520af6e739a3cd48940ed9c9e99e660004e4d7c24f635b0f60b768c45f13b40a25e4bf00 WHIRLPOOL dbcd3a1f9de18ce3229431938eb17033710ada6827899a3b9e35f8bccf6eab41330c4b548e1f47764523a5be12add795b279c564c1d8698dde760b6cecc0d4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKktJUACgkQCaWpQKGI+9QgHwCfQZuHnKRrWL6IkDeyDrMN3s3Q
-bIQAnjaRPsNkSzx732pYUS/LZgmeH9uj
-=zNkp
+iEYEAREIAAYFAlK5riwACgkQCaWpQKGI+9SHNwCggQMqUxyd6yoU8sT3vFLkwAag
+8CYAn1uiL8L4MKDddK3D8Xb2GPQsYTrV
+=nrNc
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgweather/libgweather-3.8.2.ebuild b/dev-libs/libgweather/libgweather-3.10.1.ebuild
index 198f03540dc6..e1cb241eaa9e 100644
--- a/dev-libs/libgweather/libgweather-3.8.2.ebuild
+++ b/dev-libs/libgweather/libgweather-3.10.1.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.8.2.ebuild,v 1.3 2013/08/30 21:14:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.10.1.ebuild,v 1.1 2013/12/24 15:54:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
 
-inherit gnome2
+inherit gnome2 vala
 
 DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://live.gnome.org/LibGWeather"
+HOMEPAGE="https://wiki.gnome.org/LibGWeather"
 
 LICENSE="GPL-2+"
-SLOT="2/3-3" # subslot = 3-(libgweather-3 soname suffix)
-IUSE="+introspection"
+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="
@@ -22,6 +25,7 @@ COMMON_DEPEND="
 	>=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}
@@ -30,15 +34,21 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.50
-	sys-devel/gettext
+	>=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"
-	# Do not add --disable-all-translations-in-one-xml : it will enable them
 	gnome2_src_configure \
-		--enable-locations-compression \
 		--disable-static \
-		$(use_enable introspection)
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
 }
diff --git a/dev-libs/libgweather/libgweather-3.6.2.ebuild b/dev-libs/libgweather/libgweather-3.6.2.ebuild
deleted file mode 100644
index b2d38c1db377..000000000000
--- a/dev-libs/libgweather/libgweather-3.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.6.2.ebuild,v 1.3 2013/09/01 17:26:04 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://live.gnome.org/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-1" # subslot = 3-(libgweather-3 soname suffix)
-IUSE="+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.13
-	>=net-libs/libsoup-gnome-2.25.1:2.4
-	>=dev-libs/libxml2-2.6.0
-	>=sys-libs/timezone-data-2010k
-
-	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.9
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
-	# Do not add --disable-all-translations-in-one-xml : it will enable them
-	gnome2_src_configure \
-		--enable-locations-compression \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml
index dad9001338dc..e64ea6610adb 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
+	<use>
+		<flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 45c3065de33f..fa571a861ff4 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.23 2013/12/08 18:04:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.24 2013/12/24 15:56:52 pacho Exp $
+
+*libpeas-1.9.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +libpeas-1.9.0.ebuild,
+  -libpeas-1.6.2-r1.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libpeas-1.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ed46647332ed..08afb68de61d 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libpeas-1.6.2.tar.xz 525540 SHA256 26fb143ce4e89eb809f96113cd010d33fd337833bd70ab3b29c567f19376a65f SHA512 d8c21bb808f8cdd440fc5dfb2e5376b0935a4d6599eb3951fd03d700aa212688c0fecd112adefede9911be9db9b9dff4e1e866f032a79153bd0e750b5fdbdd25 WHIRLPOOL 9b876c43880d4548777b6ad1325caf6b84ed33fac7843b166769805b2be37cccc2ae33f9274faaaefe122910e48228ae7961e083fc1e26ba4d2864d0ebec0934
 DIST libpeas-1.8.1.tar.xz 530948 SHA256 ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d SHA512 e5e63e16cb368fd6538fbdb6761e24b7befb8e54f8a55ebe96b72b70d8050bfc49e70d93558c9b96fe3846c5bb9af585f9bb8c235d124222ae5c986ea5ceb80b WHIRLPOOL 6e79b5bff3e073c2e5875c3e37b73c3cc39b34c0af1cd579a991a8c6fc696492268aa0e128eff003ed14fce06cf40f268f126d24f2b2c1cc130f5b9434b2badc
-EBUILD libpeas-1.6.2-r1.ebuild 1747 SHA256 a945f0fc6b3065f2c88facec52de5dbf825050068b9b4e73fb88e7b482260785 SHA512 3414ed010a8af140247261cf060121120e182cec60f39c1e2fdb3885688c6d682da63ffaa6c8ef3cbd4a08ae918fcd74346454cb54fb662d55c3462061daf10b WHIRLPOOL 8e3f8f6cb9d85785d76ecfa5a3f0f9a93d507aee32c59bd3e6675d38158ef6b672136711312eed761407c1940aa452e1787bd3ade51a8b5b86781428ce4f29b4
+DIST libpeas-1.9.0.tar.xz 532364 SHA256 008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d SHA512 d00b0d78a8ee3807a3c9d48259fdfaf2e60042c385c3cccc0bcd61f76415fd9225e4ef737d48a1a0afb2c12e8418bdd3e1ceaac927a083f3180faf8acbbe79b0 WHIRLPOOL edf4555b11c3a2e522a39180068cca1811125e9761e14f7315ac97c29e39fa40c5bf1e4d3d14f3650af788baa452fc3067fc31647626cfcc471c0c729421c7cf
 EBUILD libpeas-1.8.1.ebuild 2621 SHA256 55d4bddae0c30037836fbfdc8f11638057d1c3b956b7aacc9875ac4cc2fcd352 SHA512 353e79e652692bb7566a8544aa3937b260f7522d7e4e42a74c2998f3d76e98b47e3b316763c497c04eec069ecaea439f3b8201a6968023f8fa641fec8ba8c594 WHIRLPOOL fa47c3cc93eec385a1f3951a3d424f561781a58b3428e75f56e610cad99a15c7054b45961d02c0b15e142441d31f8a3a38b486264811c48bb8280f999add6a7e
-MISC ChangeLog 3699 SHA256 2c66d39c6e4c1d005f0bca0ae0fdace088f4b1ea17c2366520f3f9a4ffbeed0b SHA512 f192e108cccfda8ee8873384cd155024c32269738f8f4e59cc38ed34b252531f73bfbd3139e78f539ee6ca2007fa8428e4042458d25b68c356db3cc933958e0c WHIRLPOOL b3c90923fc09b000de05aac7a9211ca7c7cc9e295d600368a9919d59bb2379f24f5f5b9e6d6c04529cb1927529810d745840a89af7a1d62442015ae73419744a
+EBUILD libpeas-1.9.0.ebuild 2624 SHA256 b9daec3f2dd0be4cd2260e635233092b720603cecc541bbce77755e67c7fa13f SHA512 6090a2512d6acbe376b7d495e4f29822d9be47ea0b667963e572d3c1dabafda4752a37cf8498517dc9ec51a46bf40fc64faf95e0b6a73047659b1534ad7ffaa7 WHIRLPOOL 79b90bfe47f3736208af84ad22d84ff46bfea1a304eae0c85b9fdb49f139e55c00db7ef2ab26cbe9e2891a2ced23ef0a0ef7a90b5372e8c0948e3506f7a63ef8
+MISC ChangeLog 3867 SHA256 ffc2217bd98dbb36f490712842a6e05d417da5f21fa959733b0fb5a964da3d04 SHA512 09b7c13751ae9bbc983cbddfb33fd0dbe59f45b35583d353430e5d81dcaf49c10d383079f83ded5236c6d75591cbafdf1e808cdfc0761897144cf3f5fdec045f WHIRLPOOL b85814d27887a40a7f1721b18d62abf94c17e6d170321b560eea908096152e2d71f38248afcb2b54eb02e6b857b80cd142df6b4461d083782450348e31867b2f
 MISC metadata.xml 531 SHA256 51dd5faefa5c4d563cd93744c74166cd21b2fbaba1ddb8b64239c25d53962c21 SHA512 237be10858c63fd7e3c335692ca2276b3b2062b52b30de2bcc99cfbcb0fb2d059cf8facebc65a1aecd0bf9a3092c51e1cc287d35cc13f52b5b5e8d11bdbf877c WHIRLPOOL 3375f4b5fad86a6ecc774b4071c7c637a01d58ee1305210c56a5d7f5dca0b76cd183f285348366b80c202c0f5b5c42d6bd7c5c7c3d6501a414a2481e142efb48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKktLcACgkQCaWpQKGI+9R4zwCeLfr+FFaQeQF6N8NquJvRRDiu
-GRgAn3RJ/d/0ZsfipK8gv548WvulFfmF
-=qt9g
+iEYEAREIAAYFAlK5rsYACgkQCaWpQKGI+9QlcwCfQ1CuURhp2+B3u8MARye43Ykb
+1KYAniT85KIxfikkziHibIy/J8k4GFVI
+=O6QI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild b/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
deleted file mode 100644
index 3e2f458efbd0..000000000000
--- a/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild,v 1.6 2013/02/02 22:26:12 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils gnome2 multilib python-single-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="gjs +gtk glade +python seed"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-0.10.1
-	gjs? ( >=dev-libs/gjs-1.31.11 )
-	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/intltool-0.40
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		$(use_enable gjs)
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		$(use_enable python)
-		$(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?
-
-	gnome2_src_prepare
-}
-
-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
-	Xemake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.9.0.ebuild b/dev-libs/libpeas/libpeas-1.9.0.ebuild
new file mode 100644
index 000000000000..614062fdd7a7
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.9.0.ebuild,v 1.1 2013/12/24 15:56:52 pacho 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="gjs +gtk glade +python seed"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-0.10.1
+	gjs? ( >=dev-libs/gjs-1.37.1 )
+	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
+	>=sys-devel/gettext-0.17
+	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 gjs)
+		$(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
+}