Bunch of updates for recent gnome-shell test release

svn path=/; revision=284

18 files changed, 691 insertions, 48 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 463d487..b013007 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,3 +1,3 @@
-DIST gjs-0.7.4.tar.bz2 480891 RMD160 660edf3ec9c3f41550e55c5babb40e7250de4055 SHA1 a3c446d0c613e94bd87188d30efb016e906dc00d SHA256 ff38b380c64a463c98a65bee4612c8a08f8939ce09c2645c4f727c4a2b8b743b
-EBUILD gjs-0.7.4.ebuild 973 RMD160 792abd1cbb2a61a769bc7ec959a1fee692caac29 SHA1 7314601c4a934dbb10f76c6713bef90d68d085c2 SHA256 071674bfb8e36a7a18ad921e0f00ded6a12bb4705a4d5791cf0a2e08fc766a47
+DIST gjs-0.7.5.tar.bz2 482718 RMD160 d4f33af4232b57dc7b87383b73e04908c4416749 SHA1 c83116742173d59921f650dfed8bf1f237f4ad33 SHA256 520e3126cb517fa4599ae52ad188a24dfb6e8dc33fad60e675241a9317eafb11
+EBUILD gjs-0.7.5.ebuild 973 RMD160 792abd1cbb2a61a769bc7ec959a1fee692caac29 SHA1 7314601c4a934dbb10f76c6713bef90d68d085c2 SHA256 071674bfb8e36a7a18ad921e0f00ded6a12bb4705a4d5791cf0a2e08fc766a47
 EBUILD gjs-9999.ebuild 1072 RMD160 93e436f27450fa50cce2c5a732f31d6f630fa263 SHA1 93e73a103ba47eb58bbc5e74d775350ba921be52 SHA256 b4b887e245c339777994822eac6e763586350db04cd9cd83b6943384446f86eb
diff --git a/dev-libs/gjs/gjs-0.7.4.ebuild b/dev-libs/gjs/gjs-0.7.5.ebuild
index 6b9a6c4..6b9a6c4 100644
--- a/dev-libs/gjs/gjs-0.7.4.ebuild
+++ b/dev-libs/gjs/gjs-0.7.5.ebuild
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 27a714b..64ca029 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,5 +5,5 @@ AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd40
 AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
 AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
-DIST glib-2.27.0.tar.bz2 6564913 RMD160 ca60738a232986b32dd014f7b69409654e52dc79 SHA1 cbb6176c7c7ae2ba9497f5d30746eb0ab2ad6665 SHA256 7266a9580e6984658b3c55bd2683289416e87a26c35e7b1b5f6d5ac87db9ddf4
-EBUILD glib-2.27.0.ebuild 4059 RMD160 e675219f386dfa235dc557defd7d502ecf0f79b4 SHA1 39ac9fd1af75c227886bc579607cd252bf6f64b6 SHA256 ff48c016a78d2266260cdbd07c88d5f6980682487485f3e710f7ea6b4b589626
+DIST glib-2.27.1.tar.bz2 6747605 RMD160 20ee4808b44207ac7a01218ba0b42cf229835044 SHA1 e250bd5c10a4d00edaf986df5237464fa6039c4c SHA256 6071f91fab89456a425969077325a6679d9d1ccf0ebfca2d030e1bef2b66e868
+EBUILD glib-2.27.1.ebuild 4396 RMD160 e7e17396129ee6bafe41b8b452e49cff05a3041a SHA1 0fd2a437624f50ce186d5b5a07bcd41b2d4f40ba SHA256 385d5adc658fc8ab2452d1437f3709d812c2316023b451824b6abfdaedb66e41
diff --git a/dev-libs/glib/glib-2.27.0.ebuild b/dev-libs/glib/glib-2.27.1.ebuild
index f04d677..65e497b 100644
--- a/dev-libs/glib/glib-2.27.0.ebuild
+++ b/dev-libs/glib/glib-2.27.1.ebuild
@@ -14,6 +14,9 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
 
+# Due to removal of gio API, gnome bug 631398, tests will fail with:
+# symbol lookup error: /usr/lib64/gio/modules/libgiogconf.so: undefined symbol: g_desktop_app_info_lookup_get_type
+# That library is installed by gvfs, gvfs-1.6.4-r99* has a patch to remove it
 RDEPEND="virtual/libiconv
 	sys-libs/zlib
 	xattr? ( sys-apps/attr )
@@ -26,7 +29,8 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.11
 		~app-text/docbook-xml-dtd-4.1.2 )
 	test? ( >=sys-apps/dbus-1.2.14 )"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )"
+PDEPEND="introspection? ( dev-libs/gobject-introspection )
+	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
 src_prepare() {
@@ -53,8 +57,8 @@ src_prepare() {
 	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
 	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
 
-	# skip tests that require writing to /root/.dbus, upstream bug ???
-	epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
+	# skip tests that require writing to /root/.dbus, upstream bug 631379
+	#epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
 
 	# Do not try to remove files on live filesystem, upstream bug #619274
 	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 7d301e2..513e841 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-shell-2.31.2.tar.bz2 692948 RMD160 264205b60b702fa5ceafde5de362db9525de4442 SHA1 9df6117f9d3b9f9056e71f801cb1cefe66569ee9 SHA256 cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2
-EBUILD gnome-shell-2.31.2.ebuild 1122 RMD160 94c2bf2b89c0cb993dce7f87268a3eb84fe1a9c0 SHA1 3979cb86e04b9cf46d7198855dcb5e9c15f90ae8 SHA256 a361c691fed36cf892680e9a5a007bd79675981dc9fd98a389a4da25e814edcd
-EBUILD gnome-shell-9999.ebuild 1391 RMD160 c4cf171cb9f2904bd6c916c5cd4e7cb28ec95084 SHA1 ad67283d68f736f8199c1018f327e80cdbdd8272 SHA256 f19ff26e41f2c08fc3617073e12526def3b14210d28be09975348c6b40a95600
+DIST gnome-shell-2.91.1.tar.bz2 803066 RMD160 c8a030427bea60a8edbd9baedde6fc4a68782b19 SHA1 841a237936b447c836a69ba224640114429ebf08 SHA256 9ff972455a0fc3b1693d9bc0d880619d4a4a087574c92df062723368b529e937
+EBUILD gnome-shell-2.91.1.ebuild 1229 RMD160 46e32301a671724961dc19336c26b510a3f88e18 SHA1 662fb28950d35bcfc380bdb22cb073f9a5d7e496 SHA256 a816bf33323cb8c41af278465b3c0bc9266e2903cc4c854f6eeca24b6414d577
+EBUILD gnome-shell-9999.ebuild 1391 RMD160 7f56a162159069ba5aef4b319c0cc9e79c6014a1 SHA1 7f5cf81b7c3cd85bba48836057b84478843db929 SHA256 db2241b5cd9d2c0559f39ab639910e19092f59f690b97ab25ed2c6a9e66021e4
diff --git a/gnome-base/gnome-shell/gnome-shell-2.31.2.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild
index 7ad650e..7f4554b 100644
--- a/gnome-base/gnome-shell/gnome-shell-2.31.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,33 +15,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.16
+RDEPEND=">=dev-libs/glib-2.25.9
+	>=x11-libs/gtk+-2.91.0:3[introspection]
 	>=media-libs/gstreamer-0.10.16
 	>=media-libs/gst-plugins-base-0.10.16
-	>=gnome-base/gnome-desktop-2.26
-	>=dev-libs/gobject-introspection-0.6.9
+	>=gnome-base/gnome-desktop-2.91.0:3
+	>=dev-libs/gobject-introspection-0.9.5
 
 	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.6
-	>=media-libs/clutter-1.2.0[opengl,introspection]
+	>=dev-libs/gjs-0.7
+	x11-libs/pango[introspection]
+	>=media-libs/clutter-1.4.0[introspection]
 	dev-libs/libcroco:0.6
 
-	gnome-base/gconf
+	gnome-base/gconf[introspection]
 	gnome-base/gnome-menus
 	x11-libs/startup-notification
 	x11-libs/libXfixes
-	>=x11-wm/mutter-2.29.1[introspection]
+	>=x11-wm/mutter-2.91.1[gtk3,introspection]
 	x11-apps/mesa-progs
+	dev-python/dbus-python
 "
+
 DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6
 	>=dev-lang/python-2.5
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
+	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.26
 	gnome-base/gnome-common
 "
-DOCS="AUTHORS ChangeLog NEWS README"
+DOCS="AUTHORS README"
 
 pkg_postinst() {
 	elog " Start with 'gnome-shell --replace' "
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3c5e47f..d52cae2 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
new file mode 100644
index 0000000..1a73e71
--- /dev/null
+++ b/gnome-base/gvfs/Manifest
@@ -0,0 +1,6 @@
+AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
+AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
+AUX gvfs-1.6.4-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6
+AUX gvfs-glib-2.27-port.patch 11813 RMD160 735bc7b8db5921c826840b1fb8be943c62de5bc2 SHA1 9e4fc13b1816c7f2e4e1c761ed5b198b20539fc5 SHA256 0a43dc5bffcefcae0db68b0a0c085a7cea06ab51664618dd585eead4358359ce
+DIST gvfs-1.6.4.tar.bz2 1385999 RMD160 b5aeb97260534f16c565a36ef87150823fb05283 SHA1 b859dc23916d03e2e6eb7e000916929d223b32e8 SHA256 e1e2810678b42cb0160642f0cd33ccd377cddfb18fc868d6faa04c449f813693
+EBUILD gvfs-1.6.4-r990.ebuild 3362 RMD160 6d84726efdb88582c4436c9825ce959d6aa76bea SHA1 36154798449851b3c2447ca82daedf95c3bb15b3 SHA256 6db6bdab9a7886e76f872add68f6e290cca55943b3dfc07c33d880e20a5fd4d3
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
new file mode 100644
index 0000000..86222e5
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
@@ -0,0 +1,56 @@
+Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora)
+Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829
+----
+Index: mount-archive.desktop.in.in
+===================================================================
+--- mount-archive.desktop.in.in	(revision 0)
++++ mount-archive.desktop.in.in	(revision 0)
+@@ -0,0 +1,14 @@
++[Desktop Entry]
++Encoding=UTF-8
++_Name=Archive Mounter
++Exec=@libexecdir@/gvfsd-archive file=%u
++X-Gnome-Vfs-System=gio
++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
++Terminal=false
++StartupNotify=false
++Type=Application
++NoDisplay=true
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gvfs
++X-GNOME-Bugzilla-Component=archive-backend
++X-GNOME-Bugzilla-Version=@VERSION@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig	2008-07-22 15:35:49.000000000 +0200
++++ Makefile.am	2008-07-22 17:56:59.417180064 +0200
+@@ -1,5 +1,20 @@
+ NULL =
+ 
++@INTLTOOL_DESKTOP_RULE@
++
++desktop_in_files = mount-archive.desktop.in
++
++mount-archive.desktop.in: mount-archive.desktop.in.in
++	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
++desktopdir       = $(datadir)/applications
++if HAVE_ARCHIVE
++desktop_DATA     = mount-archive.desktop
++else
++desktop_DATA     = 
++endif	
++
++
+ SUBDIRS = \
+ 	common \
+ 	client \
+@@ -15,6 +30,8 @@
+ 
+ EXTRA_DIST = \
+ 	MAINTAINERS		\
++	mount-archive.desktop.in.in \
++	$(desktop_in_files)     \
+ 	$(NULL)
+ 
+ DISTCLEANFILES = \
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
new file mode 100644
index 0000000..78fecb7
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
@@ -0,0 +1,28 @@
+Gentoo bug 264941
+Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027
+---
+diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac
+--- gvfs-1.2.2/configure.ac	2009-04-03 13:00:54.000000000 +0530
++++ gvfs-1.2.2-new/configure.ac	2009-05-04 22:53:24.000000000 +0530
+@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a "
+       ;;
+   esac
+ 
++  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
++    AC_MSG_ERROR([gphoto2 support requested but not available])
++  fi
++
+   if test "x$msg_gphoto2" = "xyes"; then
+     if test "x$use_gphoto2" = "xyes"; then
+       PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
+       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
+     else
+-      AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      if test "x$enable_gphoto2" = "xyes"; then
++        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      else
++        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      fi
+       msg_gphoto2=no
+     fi
+   fi
diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
new file mode 100644
index 0000000..a236dd2
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
@@ -0,0 +1,30 @@
+From 4033907045abcf498686c1b34be7b0160260088d Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Sat, 02 Oct 2010 12:51:54 +0000
+Subject: sftp: fix poll() timeout.
+
+When switching from select() to poll() in commit
+"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934)
+the difference in seconds vs milliseconds for select/poll timeout
+argument was missed.
+
+SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000
+when using it with poll().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=631169
+---
+diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
+index 9fecf6a..f6b7785 100644
+--- a/daemon/gvfsbackendsftp.c
++++ b/daemon/gvfsbackendsftp.c
+@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
+       fds[1].fd = prompt_fd;
+       fds[1].events = POLLIN;
+       
+-      ret = poll(fds, 2, SFTP_READ_TIMEOUT);
++      ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
+       
+       if (ret <= 0)
+         {
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch b/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch
new file mode 100644
index 0000000..73cc912
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch
@@ -0,0 +1,388 @@
+From e868c0c306c31ffb9b65ca8555fd27cdc53a083d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 5 Oct 2010 14:12:00 +0100
+Subject: [PATCH] Remove app lookup extension
+
+Now done in GIO itself
+
+https://bugzilla.gnome.org/show_bug.cgi?id=631398
+---
+ Makefile.am             |    1 -
+ configure.ac            |    1 -
+ gconf/Makefile.am       |   32 ---------
+ gconf/gapplookupgconf.c |  178 -----------------------------------------------
+ gconf/gapplookupgconf.h |   51 -------------
+ gconf/gconf-module.c    |   55 ---------------
+ 6 files changed, 0 insertions(+), 318 deletions(-)
+ delete mode 100644 gconf/Makefile.am
+ delete mode 100644 gconf/gapplookupgconf.c
+ delete mode 100644 gconf/gapplookupgconf.h
+ delete mode 100644 gconf/gconf-module.c
+
+diff --git a/Makefile.am b/Makefile.am
+index 95d0654..23261da 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,6 @@ SUBDIRS = \
+ 	client \
+ 	daemon \
+ 	monitor \
+-	gconf \
+ 	po   \
+ 	programs \
+ 	test \
+diff --git a/configure.ac b/configure.ac
+index a4e3387..94c870e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -704,7 +704,6 @@ monitor/hal/Makefile
+ monitor/gdu/Makefile
+ monitor/gphoto2/Makefile
+ monitor/afc/Makefile
+-gconf/Makefile
+ programs/Makefile
+ test/Makefile
+ po/Makefile.in
+diff --git a/gconf/Makefile.am b/gconf/Makefile.am
+deleted file mode 100644
+index 85d4d8d..0000000
+--- a/gconf/Makefile.am
++++ /dev/null
+@@ -1,32 +0,0 @@
+-
+-NULL =
+-
+-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
+-
+-if USE_GCONF
+-giomodules_LTLIBRARIES = libgiogconf.la
+-endif
+-
+-libgiogconf_la_SOURCES =				\
+-	gapplookupgconf.c gapplookupgconf.h		\
+-	gconf-module.c					\
+-	$(NULL)
+-
+-libgiogconf_la_CFLAGS =		\
+-	-DG_LOG_DOMAIN=\"GVFS-GConf\"		\
+-	-I$(top_srcdir)/common                  \
+-	$(GLIB_CFLAGS)                          \
+-	$(GCONF_CFLAGS)                         \
+-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
+-	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
+-	-DG_DISABLE_DEPRECATED			\
+-	$(NULL)
+-
+-libgiogconf_la_LDFLAGS = 	\
+-	$(module_flags)         \
+-	$(NULL)
+-
+-libgiogconf_la_LIBADD  =	     \
+-	$(GLIB_LIBS)                 \
+-	$(GCONF_LIBS)                \
+-	$(NULL)
+diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c
+deleted file mode 100644
+index 2690265..0000000
+--- a/gconf/gapplookupgconf.c
++++ /dev/null
+@@ -1,178 +0,0 @@
+-
+-/* GIO - GLib Input, Output and Streaming Library
+- * 
+- * Copyright (C) 2006-2007 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- *
+- * Author: Alexader Larsson <alexl@redhat.com>
+- */
+-
+-#include <config.h>
+-
+-#include <string.h>
+-
+-#include <glib.h>
+-#include <glib/gi18n-lib.h>
+-#include <gio/gio.h>
+-#include <gconf/gconf-client.h>
+-
+-#include "gapplookupgconf.h"
+-
+-
+-struct _GAppLookupGConf {
+-  GObject parent;
+-
+-};
+-
+-static void lookup_iface_init (GDesktopAppInfoLookupIface *iface);
+-static void g_app_lookup_gconf_finalize (GObject *object);
+-
+-G_DEFINE_DYNAMIC_TYPE_EXTENDED (GAppLookupGConf, g_app_lookup_gconf, G_TYPE_OBJECT, 0,
+-                                G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LOOKUP,
+-							       lookup_iface_init))
+-
+-static void
+-g_app_lookup_gconf_finalize (GObject *object)
+-{
+-  if (G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize)
+-    (*G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize) (object);
+-}
+-
+-static GObject *
+-g_app_lookup_gconf_constructor (GType                  type,
+-                                guint                  n_construct_properties,
+-                                GObjectConstructParam *construct_properties)
+-{
+-  GObject *object;
+-  GAppLookupGConfClass *klass;
+-  GObjectClass *parent_class;  
+-
+-  object = NULL;
+-
+-  /* Invoke parent constructor. */
+-  klass = G_APP_LOOKUP_GCONF_CLASS (g_type_class_peek (G_TYPE_APP_LOOKUP_GCONF));
+-  parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
+-  object = parent_class->constructor (type,
+-                                      n_construct_properties,
+-                                      construct_properties);
+-
+-  return object;
+-}
+-
+-static void
+-g_app_lookup_gconf_init (GAppLookupGConf *lookup)
+-{
+-}
+-
+-static void
+-g_app_lookup_gconf_class_finalize (GAppLookupGConfClass *klass)
+-{
+-}
+-
+-
+-static void
+-g_app_lookup_gconf_class_init (GAppLookupGConfClass *klass)
+-{
+-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+-
+-  gobject_class->constructor = g_app_lookup_gconf_constructor;
+-  gobject_class->finalize = g_app_lookup_gconf_finalize;
+-}
+-
+-#define GCONF_PATH_PREFIX "/desktop/gnome/url-handlers/"
+-
+-static GAppInfo *
+-get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
+-                            const char  *uri_scheme)
+-{
+-  GAppInfo *appinfo;
+-  GConfClient *client;
+-  char *command_key, *enabled_key, *terminal_key, *command;
+-  gboolean enabled, needs_terminal;
+-  GAppInfoCreateFlags flags;
+-
+-  appinfo = NULL;
+-  
+-  client = gconf_client_get_default ();
+-  
+-  command_key = g_strconcat (GCONF_PATH_PREFIX,
+-                             uri_scheme,
+-                             "/command",
+-                             NULL);
+-  command = gconf_client_get_string (client,
+-                                     command_key,
+-                                     NULL);
+-  g_free (command_key);
+-  if (command)
+-    {
+-      enabled_key = g_strconcat (GCONF_PATH_PREFIX,
+-                                 uri_scheme,
+-                                 "/enabled",
+-                                 NULL);
+-      enabled = gconf_client_get_bool (client,
+-                                       enabled_key,
+-                                       NULL);
+-      g_free (enabled_key);
+-      
+-      terminal_key = g_strconcat (GCONF_PATH_PREFIX,
+-                                  uri_scheme,
+-                                  "/needs_terminal",
+-                                  NULL);
+-      needs_terminal = gconf_client_get_bool (client,
+-                                              terminal_key,
+-                                              NULL);
+-      g_free (terminal_key);
+-
+-      if (enabled)
+-        {
+-          if (g_str_has_suffix (command, "\"%s\"") ||
+-              g_str_has_suffix (command, "\'%s\'"))
+-            command[strlen (command) - 4] = 0;
+-          else if (g_str_has_suffix (command, "%s"))
+-            command[strlen (command) - 2] = 0;
+-
+-          flags = G_APP_INFO_CREATE_SUPPORTS_URIS;
+-          if (needs_terminal)
+-            flags |= G_APP_INFO_CREATE_NEEDS_TERMINAL;
+-          appinfo = g_app_info_create_from_commandline (command,
+-                                                        NULL,
+-                                                        flags,
+-                                                        NULL);
+-        }
+-    }
+-  
+-  g_object_unref (client);
+-  g_free (command);
+-  
+-  return appinfo;
+-}
+-
+-static void
+-lookup_iface_init (GDesktopAppInfoLookupIface *iface)
+-{
+-  iface->get_default_for_uri_scheme = get_default_for_uri_scheme;
+-}
+-
+-void 
+-g_app_lookup_gconf_register (GIOModule *module)
+-{
+-  g_app_lookup_gconf_register_type (G_TYPE_MODULE (module));
+-  g_io_extension_point_implement (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME,
+-				  G_TYPE_APP_LOOKUP_GCONF,
+-				  "gconf",
+-				  10);
+-}
+diff --git a/gconf/gapplookupgconf.h b/gconf/gapplookupgconf.h
+deleted file mode 100644
+index a268415..0000000
+--- a/gconf/gapplookupgconf.h
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/* GIO - GLib Input, Output and Streaming Library
+- * 
+- * Copyright (C) 2006-2007 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- *
+- * Author: Alexander Larsson <alexl@redhat.com>
+- */
+-
+-#ifndef __G_APP_LOOKUP_GCONF_H__
+-#define __G_APP_LOOKUP_GCONF_H__
+-
+-#include <glib-object.h>
+-#include <gio/gio.h>
+-#include <gio/gdesktopappinfo.h>
+-
+-
+-G_BEGIN_DECLS
+-
+-#define G_TYPE_APP_LOOKUP_GCONF        (g_app_lookup_gconf_get_type ())
+-#define G_APP_LOOKUP_GCONF(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConf))
+-#define G_APP_LOOKUP_GCONF_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConfClass))
+-#define G_IS_APP_LOOKUP_GCONF(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LOOKUP_GCONF))
+-#define G_IS_APP_LOOKUP_GCONF_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LOOKUP_GCONF))
+-
+-typedef struct _GAppLookupGConf GAppLookupGConf;
+-typedef struct _GAppLookupGConfClass GAppLookupGConfClass;
+-
+-struct _GAppLookupGConfClass {
+-  GObjectClass parent_class;
+-};
+-
+-GType g_app_lookup_gconf_get_type (void) G_GNUC_CONST;
+-void  g_app_lookup_gconf_register (GIOModule         *module);
+-
+-G_END_DECLS
+-
+-#endif /* __G_APP_LOOKUP_GCONF_H__ */
+diff --git a/gconf/gconf-module.c b/gconf/gconf-module.c
+deleted file mode 100644
+index e5753a6..0000000
+--- a/gconf/gconf-module.c
++++ /dev/null
+@@ -1,55 +0,0 @@
+-
+-/* GIO - GLib Input, Output and Streaming Library
+- * 
+- * Copyright (C) 2006-2007 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- *
+- * Author: David Zeuthen <davidz@redhat.com>
+- */
+-
+-#include <config.h>
+-
+-#include <glib.h>
+-#include <glib/gi18n-lib.h>
+-#include <gmodule.h>
+-#include <gio/gio.h>
+-
+-#include "gapplookupgconf.h"
+-
+-void
+-g_io_module_load (GIOModule *module)
+-{
+-  bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+-
+-  g_app_lookup_gconf_register (module);
+-}
+-
+-void
+-g_io_module_unload (GIOModule *module)
+-{
+-}
+-
+-char **
+-g_io_module_query (void)
+-{
+-  char *eps[] = {
+-    G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME,
+-    NULL
+-  };
+-  return g_strdupv (eps);
+-}
+-- 
+1.7.2.2
+
diff --git a/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild b/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild
new file mode 100644
index 0000000..ce45a14
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools bash-completion gnome2 eutils
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+# Needs glib-2.27, which is unkeyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
++http iphone samba +udev"
+
+# Need newer glib for gnome bug 631398
+# patch applied below
+RDEPEND=">=dev-libs/glib-2.27.1
+	>=sys-apps/dbus-1.0
+	dev-libs/libxml2
+	net-misc/openssh
+	>=sys-fs/udev-138
+	archive? ( app-arch/libarchive )
+	avahi? ( >=net-dns/avahi-0.6 )
+	bluetooth? (
+		>=app-mobilephone/obex-data-server-0.4.5
+		dev-libs/dbus-glib
+		net-wireless/bluez
+		dev-libs/expat )
+	fuse? ( sys-fs/fuse )
+	gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
+	gnome? ( >=gnome-base/gconf-2.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	iphone? ( app-pda/libimobiledevice )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-fs/udev-145[extras] )
+	hal? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-apps/hal-0.5.10 )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
+			<=net-fs/samba-3.3 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	if use cdda && ! use hal && ! use udev; then
+		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
+		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+	fi
+
+	G2CONF="${G2CONF}
+		--enable-udev
+		--disable-bash-completion
+		--with-dbus-service-dir=/usr/share/dbus-1/services
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable cdda)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gnome gconf)
+		$(use_enable gphoto2)
+		$(use_enable iphone afc)
+		$(use_enable udev gudev)
+		$(use_enable hal)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# sftp: fix poll() timeout, bug #339695
+	epatch "${FILESDIR}/${P}-sftp-timeout.patch"
+
+	# Remove app lookup gconf extension
+	# https://bugzilla.gnome.org/show_bug.cgi?id=631398
+	epatch "${FILESDIR}/${PN}-glib-2.27-port.patch"
+
+	# Conditional patching purely to avoid eautoreconf
+	use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"
+
+	if use archive; then
+		epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch"
+		echo "mount-archive.desktop.in" >> po/POTFILES.in
+		echo "mount-archive.desktop.in.in" >> po/POTFILES.in
+	fi
+
+	use gphoto2 || use archive && eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	use bash-completion && \
+		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use bash-completion && bash-completion_pkg_postinst
+
+	ewarn "In order to use the new gvfs services, please reload dbus configuration"
+	ewarn "You may need to log out and log back in for some changes to take effect"
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5460c2f..0a578e1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
-DIST gtk+-2.91.1.tar.bz2 16330299 RMD160 1848b3bd55543328bbb26b4d790d6b60fa31b799 SHA1 a468b6d35957265997d452b4868f1cd6fd7583af SHA256 465557060c4c3cef3f9aaa608da375e87500a27b531957eb67183ad9fa3cab6f
-EBUILD gtk+-2.91.1.ebuild 4611 RMD160 d5a2491a1b652bbc7e650eb8b84c3bc46616c5fe SHA1 1855d08e08b1a830741c222fd78532b2bd1ae8f4 SHA256 21946b8ff315b0a7d2553f0a7ab26cbb7916bdbe27af209efb4a5fd3c6c4a94d
+DIST gtk+-2.91.2.tar.bz2 16329107 RMD160 fd48d789df83e4a60e80876da3fc145c84af85fc SHA1 2c84ed83e5e47dbb0b5b7e81e641c2b805e84d54 SHA256 754459ed3d6a1667a8a2a88be1c47914f620c6fbd0fd6329b7bdf48eb9ed4d05
+EBUILD gtk+-2.91.2.ebuild 4625 RMD160 ec51a6436057dc2230dc232fb26e4ca4d716cada SHA1 821abb11e2c5b6ba71016516d58daf4cf9f9e3e0 SHA256 6534b98e78a71d4125e991e3c2827509c4177a67b953658881ec9cee630a65d9
diff --git a/x11-libs/gtk+/gtk+-2.91.1.ebuild b/x11-libs/gtk+/gtk+-2.91.2.ebuild
index 79f1576..d7af8bc 100644
--- a/x11-libs/gtk+/gtk+-2.91.1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.91.2.ebuild
@@ -26,15 +26,15 @@ RDEPEND="!aqua? (
 		x11-libs/libXfixes
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
-		>=x11-libs/cairo-1.9.10[X,svg]
-		x11-libs/gdk-pixbuf[X,introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/cairo-1.10.0[X,svg]
+		>=x11-libs/gdk-pixbuf-2.21[X,introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	aqua? (
-		>=x11-libs/cairo-1.9.10[aqua,svg]
-		x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?]
+		>=x11-libs/cairo-1.10.0[aqua,svg]
+		>=x11-libs/gdk-pixbuf-2.21[introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.0
+	>=dev-libs/glib-2.27.1
 	>=x11-libs/pango-1.20[introspection?]
 	>=dev-libs/atk-1.29.2[introspection?]
 	media-libs/fontconfig
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index d0feaf7..80d4630 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,3 @@
-DIST mutter-2.31.2.tar.bz2 1983139 RMD160 50de5de7fe6de9dde98ecb9476f8fcc5cba9307f SHA1 8bfd51c44323e492df1427c1b01816b73e72fb06 SHA256 7267018c2eb28213748810de7e1ccf6d4f059e8ab593ec335234588d0037578c
-EBUILD mutter-2.31.2.ebuild 1372 RMD160 5d4137a0b58397e3e219a9aeaf529a0e9c582c9d SHA1 ae72345c70cb9bbfa0553f73e7c4f30571f049c6 SHA256 a439e34d85a65b0887fdd3e5a23fb16276e0924f96405a351daffccb0ff501f2
-EBUILD mutter-9999.ebuild 1876 RMD160 3dfc21e44ee3ec2f41c2e9fd74e035653ce2e830 SHA1 a3da4b80fac89766491e47c275e607f5461fca21 SHA256 32c1aabd070c67ff1735f7c37d69bc9a1f20b682b749ae184b1832ae85786aea
+DIST mutter-2.91.1.tar.bz2 2008441 RMD160 6cf59361f89567ffa811fcc6f12cdafc25999b5d SHA1 30e1e7b9637ce8e246d10498591d5c174b043232 SHA256 b0587ff01945f139ce195ca61023c70200167e7f42e56a6d5b6244e5f1072431
+EBUILD mutter-2.91.1.ebuild 1780 RMD160 aa15dbcf03f03fb4d6844d1adfd91a190722f996 SHA1 10d9b7c70962fc0f973e65b339e1157f740cf0aa SHA256 1092b73322c1217c19fde2b650124aff51fd296d78c842a550da05757c72abd5
+EBUILD mutter-9999.ebuild 1909 RMD160 5c415ccaed69043c055613d61f4329469d7e2e41 SHA1 43a3543c4fe8538dd3760953fb28e2360bdf6da4 SHA256 bda41ce6d10aeb46c4d1f780216f5e9fd3526149325dc6de980670da14552433
diff --git a/x11-wm/mutter/mutter-2.31.2.ebuild b/x11-wm/mutter/mutter-2.91.1.ebuild
index f509eef..75dadc1 100644
--- a/x11-wm/mutter/mutter-2.31.2.ebuild
+++ b/x11-wm/mutter/mutter-2.91.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,16 +12,20 @@ HOMEPAGE="http://blogs.gnome.org/metacity/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug introspection test xinerama"
+IUSE="debug +gtk3 +introspection +sound test xinerama"
 
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2[X]
+RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.10[X]
+	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?]
+			sound? (  >=media-libs/libcanberra-0.24[gtk] ) )
+	gtk3? ( >=x11-libs/gtk+-2.90.7:3[introspection?]
+			sound? (  >=media-libs/libcanberra-0.26[gtk3] ) )
 	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
+	>=dev-libs/glib-2.14
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 
-	>=media-libs/clutter-1.2.0
+	>=media-libs/clutter-1.2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -32,7 +36,7 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	x11-libs/libXrandr
 	x11-libs/libXrender
 
-	introspection? ( dev-libs/gobject-introspection )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	xinerama? ( x11-libs/libXinerama )
 	gnome-extra/zenity
 	!x11-misc/expocity"
@@ -48,7 +52,7 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--enable-gconf
 		--enable-shape
@@ -56,6 +60,14 @@ pkg_setup() {
 		--enable-startup-notification
 		--enable-xsync
 		--enable-verbose-mode
+		--enable-compile-warnings
+		$(use_with sound libcanberra)
 		$(use_with introspection)
 		$(use_enable xinerama)"
+
+	if use gtk3; then
+		G2CONF="${G2CONF} --with-gtk=3.0"
+	else
+		G2CONF="${G2CONF} --with-gtk=2.0"
+	fi
 }
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index d7e5129..6661063 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -18,10 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug +gtk3 +introspection +sound test xinerama"
 
 RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.10[X]
 	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?]
-			sound? (  media-libs/libcanberra[gtk] ) )
-	gtk3? ( >=x11-libs/gtk+-2.90:3[introspection?]
-			sound? (  media-libs/libcanberra[gtk3] ) )
+			sound? (  >=media-libs/libcanberra-0.24[gtk] ) )
+	gtk3? ( >=x11-libs/gtk+-2.90.7:3[introspection?]
+			sound? (  >=media-libs/libcanberra-0.26[gtk3] ) )
 	>=gnome-base/gconf-2
 	>=dev-libs/glib-2.14
 	>=x11-libs/startup-notification-0.7
@@ -38,7 +39,7 @@ RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	x11-libs/libXrandr
 	x11-libs/libXrender
 
-	introspection? ( dev-libs/gobject-introspection )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	xinerama? ( x11-libs/libXinerama )
 	gnome-extra/zenity
 	!x11-misc/expocity"
@@ -54,7 +55,7 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--enable-gconf
 		--enable-shape
@@ -72,9 +73,6 @@ pkg_setup() {
 	else
 		G2CONF="${G2CONF} --with-gtk=2.0"
 	fi
-}
-
-src_prepare() {
 
 	intltoolize --force --copy --automake || die
 	eautoreconf