First bunch of GNOME 3.5.2 stuff

svn path=/; revision=337

32 files changed, 1565 insertions, 3 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
new file mode 100644
index 0000000..9319036
--- /dev/null
+++ b/dev-libs/glib/Manifest
@@ -0,0 +1,6 @@
+AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
+AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
+AUX glib-2.31.x-external-gdbus-codegen.patch 3485 RMD160 d74fa54b05e6622d590e3203d6cf40d0b808160e SHA1 c455ac0ab5cc1adfdded24927f4da19494993986 SHA256 94d40838459b7fddc5051d15aa97a860d5d02a07b454c6da86021b663738bea9
+DIST glib-2.33.2.tar.xz 6175284 RMD160 097f6b882c5cf9567f6ad72d59eb38ab3d3ea876 SHA1 f780624e0ee4cee26dfef7f1b3a6b1c9d568cb8d SHA256 b7163e9f159775d13ecfb433d67c3f0883e0e518e85b2e970d4ad9773d7cd0b4
+DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
+EBUILD glib-2.33.2.ebuild 8222 RMD160 6c3034a95270f33a2d4c32b36d9b9963201db592 SHA1 19c4d310088bf12161796eea3a046b40b15fe798 SHA256 46aad119674b35e83942ba7b1c9fa11b139a5c45efb813a610bd20f6e533e631
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
new file mode 100644
index 0000000..0859e33
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
@@ -0,0 +1,39 @@
+From Debian, this one is needed for gcc < 4.1...
+
+--- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
++++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
+@@ -414,14 +414,14 @@
+ g_atomic_int_exchange_and_add (volatile gint *atomic,
+ 			       gint           val)
+ {
+-  return __sync_fetch_and_add (atomic, val);
++  return __sync_fetch_and_add_si (atomic, val);
+ }
+  
+ void
+ g_atomic_int_add (volatile gint *atomic, 
+ 		  gint val)
+ {
+-  __sync_fetch_and_add (atomic, val);
++  __sync_fetch_and_add_si (atomic, val);
+ }
+ 
+ gboolean
+@@ -429,7 +429,7 @@
+ 				   gint           oldval, 
+ 				   gint           newval)
+ {
+-  return __sync_bool_compare_and_swap (atomic, oldval, newval);
++  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
+ }
+ 
+ gboolean
+@@ -437,7 +437,7 @@
+ 				       gpointer           oldval, 
+ 				       gpointer           newval)
+ {
+-  return __sync_bool_compare_and_swap ((long *)atomic, 
++  return __sync_bool_compare_and_swap_di ((long *)atomic, 
+ 				       (long)oldval, (long)newval);
+ }
+ 
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
new file mode 100644
index 0000000..bba6329
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
@@ -0,0 +1,21 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
+--- glib-2.12.12.orig/gmodule/gmodule-dl.c	2007-05-01 19:12:40.000000000 -0400
++++ glib-2.12.12/gmodule/gmodule-dl.c	2007-07-05 20:10:51.000000000 -0400
+@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -117,6 +118,9 @@ _g_module_self (void)
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
new file mode 100644
index 0000000..bd3afee
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
@@ -0,0 +1,98 @@
+From 457ac2926e754bbebd72ee3606ad405ccfd2e952 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 3 Feb 2012 09:08:28 +0200
+Subject: [PATCH] Split out gdbus codegen
+
+---
+ configure.ac                                       |    3 +--
+ docs/reference/gio/Makefile.am                     |    3 +--
+ gio/Makefile.am                                    |    2 +-
+ gio/tests/Makefile.am                              |    6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am |    6 ++----
+ 5 files changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 833891b..697ce60 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -380,7 +380,7 @@ fi
+ AC_SUBST(PERL_PATH)
+ 
+ # Need suitable python path for greport
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+ 
+ 
+ dnl ***********************
+@@ -3561,7 +3561,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/xdgmime/Makefile
+ gio/inotify/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 7d2d264..7cac0b2 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -148,8 +148,7 @@ man_MANS =			\
+ 	glib-compile-resources.1	\
+ 	gsettings.1		\
+ 	gresource.1		\
+-	gdbus.1			\
+-	gdbus-codegen.1
++	gdbus.1
+ 
+ if ENABLE_MAN
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index dae04b4..835ccc7 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
+ 
+ NULL =
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index c5cf59d..be9e48c 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -293,10 +293,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
+ gdbus_close_pending_LDADD = $(progs_ldadd)
+ 
+ if OS_UNIX
+-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : 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 gdbus-test-codegen-generated.c : 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 9861d0e..9ca6eb9 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -21,10 +21,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 \
+-- 
+1.7.8.6
+
diff --git a/dev-libs/glib/glib-2.33.2.ebuild b/dev-libs/glib/glib-2.33.2.ebuild
new file mode 100644
index 0000000..72e8bf5
--- /dev/null
+++ b/dev-libs/glib/glib-2.33.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.7 2012/04/30 19:17:06 ssuominen Exp $
+
+EAPI="4"
+PYTHON_DEPEND="utils? 2"
+# Avoid runtime dependency on python when USE=test
+
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2"
+SLOT="2"
+IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="virtual/libiconv
+	virtual/libffi
+	sys-libs/zlib
+	|| (
+		>=dev-libs/elfutils-0.142
+		>=dev-libs/libelf-0.8.11 )
+	xattr? ( sys-apps/attr )
+	fam? ( virtual/fam )
+	utils? ( >=dev-util/gdbus-codegen-${PV} )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.15
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gdbus-codegen-${PV}
+		>=dev-util/gtk-doc-1.15
+		~app-text/docbook-xml-dtd-4.1.2 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		=dev-lang/python-2*
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2"
+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
+
+pkg_setup() {
+	# Needed for gio/tests/gdbus-testserver.py
+	if use test ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+	if use ia64 ; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
+	# Fix gmodule issues on fbsd; bug #184301
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	# 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"
+
+	# need to build tests if USE=doc for bug #387385
+	if ! use test && ! use doc; then
+		# don't waste time building tests
+		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+	else
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		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
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
+			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
+	fi
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+
+	# disable pyc compiling
+	use test && python_clean_py-compile_files
+
+	# Needed for the punt-python-check patch, disabling timeout test
+	# Also needed to prevent croscompile failures, see bug #267603
+	# Also needed for the no-gdbus-codegen patch
+	AT_M4DIR="${WORKDIR}" eautoreconf
+
+	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig
+	if ! has_version dev-util/pkgconfig; 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
+
+	# 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.
+	# -- compnerd (3/27/06)
+	use debug && myconf="--enable-debug"
+
+	# Always use internal libpcre, bug #254659
+	econf ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable doc man) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		--with-pcre=internal \
+		--with-threads=posix
+}
+
+src_install() {
+	local f
+
+	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
+	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+
+	if ! use utils; then
+		rm "${ED}usr/bin/gtester-report"
+	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/"
+
+	dodoc AUTHORS ChangeLog* NEWS* README
+
+	insinto /usr/share/bash-completion
+	for f in gdbus gsettings; do
+		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
+	done
+	rm -rf "${ED}/etc"
+
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+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
+
+	# 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 "${S}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+pkg_preinst() {
+	# Only give the introspection message if:
+	# * The user has gobject-introspection
+	# * Has glib already installed
+	# * Previous version was different from new version
+	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
+		ewarn "You must rebuild gobject-introspection so that the installed"
+		ewarn "typelibs and girs are regenerated for the new APIs in glib"
+	fi
+}
+
+pkg_postinst() {
+	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
+	if has_version dev-libs/dbus-glib; then
+		ewarn "If you experience a breakage after updating dev-libs/glib try"
+		ewarn "rebuilding dev-libs/dbus-glib"
+	fi
+
+	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/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
new file mode 100644
index 0000000..236f50f
--- /dev/null
+++ b/gnome-base/dconf/Manifest
@@ -0,0 +1,2 @@
+DIST dconf-0.13.0.tar.xz 206212 RMD160 c8efc492e92337a9209ff896ac733393e139e6db SHA1 d119b5ea6ff09524d9c9a0cc3d72205d32f25cef SHA256 ae936eeeee1b9f6346c322f91590194bcce80858a209bc4fa0dbbca4a714021e
+EBUILD dconf-0.13.0.ebuild 1704 RMD160 fce8f29a04d0764701702b8920bb4fc192245eb6 SHA1 216c5201064b0fdf177845458b5352f4b3ac3346 SHA256 a3009332154f460291931c8ed66311f04ff3401970023c71921ce7e11d667835
diff --git a/gnome-base/dconf/dconf-0.13.0.ebuild b/gnome-base/dconf/dconf-0.13.0.ebuild
new file mode 100644
index 0000000..7601374
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.13.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.12.1.ebuild,v 1.1 2012/05/01 19:39:01 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 bash-completion-r1
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="http://live.gnome.org/dconf"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc +X"
+
+RDEPEND=">=dev-libs/glib-2.31.18:2
+	sys-apps/dbus
+	X? ( >=dev-libs/libxml2-2.7.7:2
+		x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.15 )"
+# eautoreconf requires gtk-doc-am
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		$(use_enable X editor)
+		VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found
+}
+
+src_install() {
+	gnome2_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+
+	# Remove bash-completion file installed by build system
+	rm -rv "${ED}etc/bash_completion.d/" || die
+	newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 341de93..4859f24 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,4 @@
 AUX gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch 6674 RMD160 497c335cceacbfb3436acc3cbead9d5bbd7afb0c SHA1 41818bcb51aa237545cbff43b11d6f0e69817c0e SHA256 3a31a4ebfcde70d75691c606a3a86ed366fa114d74e60d3ff3bb4b74945660a3
+DIST gnome-control-center-3.5.2.tar.xz 4352040 RMD160 e582a5d51e03061ef567dddfe6d817266e6e7692 SHA1 3a7716583268160c5ecbd3a917d4762249ecece8 SHA256 cd7524095fe6d593d534a5c70409332125b719636c8d65503049547d5bcc0f5a
+EBUILD gnome-control-center-3.5.2.ebuild 3855 RMD160 434967cd2807435bc62b4cd0acd1ef10e3a0ffe0 SHA1 dd2fdc051e026c0dadaf8523ad3b13647d8fe6a1 SHA256 4eb3272749d3f1ad4715739c59b615b41b7fda36f99cf701b76d1d2c86f55933
 EBUILD gnome-control-center-9999.ebuild 3957 RMD160 ff370169d2be3a553ced1534028afb1b0fbcd12a SHA1 4e5d78cbad8981dd56d2af567e89144890023ca6 SHA256 38dc19a31db17356076ce1910f5356c47018d0419cd9c5f614414a75b720da4c
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.5.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.5.2.ebuild
new file mode 100644
index 0000000..f679162
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.5.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
+#
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
+# g-s-d[policykit] needed for bug #403527
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.3.5:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.1
+	>=gnome-base/gnome-desktop-3.5.1:3
+	>=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit]
+
+	app-text/iso-codes
+	dev-libs/libxml2:2
+	gnome-base/gnome-menus:3
+	gnome-base/libgtop:2
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-0.9.16[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
+	>=dev-libs/libpwquality-1.1.0
+
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-3.3.5 )
+	colord? ( >=x11-misc/colord-0.1.8 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
+	socialweb? ( net-libs/libsocialweb )
+	systemd? ( >=sys-apps/systemd-31 )
+	wacom? ( >=dev-libs/libwacom-0.5
+		x11-libs/libXi )"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
+	sys-apps/accountsservice
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? ( net-print/cups-pk-helper )
+	!systemd? ( sys-auth/consolekit )
+	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_enable bluetooth)
+		$(use_with cheese)
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_enable gnome-online-accounts goa)
+		$(use_with socialweb libsocialweb)
+		$(use_enable systemd)
+		$(use_enable wacom)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.5.1-optional-bt-colord-goa-wacom.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
+
+	gnome2_src_prepare
+
+	# panels/datetime/Makefile.am gets touched as a result of something in our
+	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
new file mode 100644
index 0000000..4fe605a
--- /dev/null
+++ b/gnome-base/gnome-desktop/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-desktop-3.5.2.tar.xz 957500 RMD160 7fb41b0c5e67b085f922d4c7edfe3b73aec60243 SHA1 61bcb3cbbefefa8a2c417b7212eb6215bae37b14 SHA256 1dd1eeb6d664182639e233fe8debcd80c72c0408606f60fd8771044a94c177a8
+EBUILD gnome-desktop-3.5.2.ebuild 2040 RMD160 60834221a3f3f021222c08b40af535d2a52550dd SHA1 87dcd50b0d5f6b143be3ad8253416dbf1a0178a3 SHA256 f0149852d21dd128b7e456ab3806e0360fcf862f2496687f6322fe65ab41cbeb
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild
new file mode 100644
index 0000000..d3a7ac0
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild,v 1.1 2012/05/20 09:59:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="3"
+IUSE="doc +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+# Latest schemas needed due to commit 7f3e3d52
+# cairo[X] needed for gnome-bg
+RDEPEND="
+	>=dev-libs/glib-2.19.1:2
+	x11-libs/cairo[X]
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libX11
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
+	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
+		$(use_enable introspection)"
+}
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
new file mode 100644
index 0000000..28a3b77
--- /dev/null
+++ b/gnome-base/gnome-menus/Manifest
@@ -0,0 +1,4 @@
+AUX 10-xdg-menu-gnome-r1 159 RMD160 a0e1372c398b06fb6d6590acaf8e6155f2858a4b SHA1 86b702d6926a5c3588a457f2c8c40532b1255210 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378
+AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 RMD160 39b97747a5b87c8bc217082268fa825e767cf528 SHA1 0d9cf9fae2224a3a42ef93ca51105fa8b33f0a42 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe
+DIST gnome-menus-3.5.2.tar.xz 419244 RMD160 026ff562a88a8c4d2939c516056161ac7acdc391 SHA1 869f8e4703c8cb60a9eb81e15e309a8218ff1b21 SHA256 43c7615d4aa9644c8d29accfc65202f178656025e69f2da510851a2d4b85d6a5
+EBUILD gnome-menus-3.5.2.ebuild 3066 RMD160 8387c4e013c30f64ee622ba4be01e41135a527b1 SHA1 a9ffbafd0fac3fe9e68d94a30c761513a6a92e96 SHA256 118e67c8146a8d21e8c1d2728b9d26bd502a6e9733d0b437fc6cff3e93c5799f
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
new file mode 100644
index 0000000..4bbf863
--- /dev/null
+++ b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; }
+then
+	export XDG_MENU_PREFIX=gnome-
+fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
new file mode 100644
index 0000000..5f5f8b2
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
@@ -0,0 +1,22 @@
+--- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
++++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
+@@ -146,6 +146,19 @@
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
+         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++        <Not><Category>X-KDE-settings-accessibility</Category></Not>
++        <Not><Category>X-KDE-settings-components</Category></Not>
++        <Not><Category>X-KDE-settings-desktop</Category></Not>
++        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
++        <Not><Category>X-KDE-settings-network</Category></Not>
++        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
++        <Not><Category>X-KDE-settings-peripherals</Category></Not>
++        <Not><Category>X-KDE-settings-hardware</Category></Not>
++        <Not><Category>X-KDE-settings-power</Category></Not>
++        <Not><Category>X-KDE-settings-security</Category></Not>
++        <Not><Category>X-KDE-settings-sound</Category></Not>
++        <Not><Category>X-KDE-settings-system</Category></Not>
++        <Not><Category>X-KDE-information</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild
new file mode 100644
index 0000000..5761479
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild,v 1.1 2012/05/20 09:47:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+# +python for gmenu-simple-editor
+IUSE="debug +introspection +python test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	python? (
+		>=dev-libs/gobject-introspection-0.9.5
+		dev-python/pygobject:3
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection] )"
+# Older versions of slot 0 install the menu editor and the desktop directories
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-menus-3.0.1-r1:0"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	test? ( dev-libs/gjs )"
+
+pkg_setup() {
+	use python && python_pkg_setup
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	if ! use debug ; then
+		G2CONF="${G2CONF} --enable-debug=minimum"
+	fi
+
+	if use python || use introspection; then
+		use introspection || ewarn "Enabling introspection due to USE=python"
+		G2CONF="${G2CONF} --enable-introspection"
+	else
+		G2CONF="${G2CONF} --disable-introspection"
+	fi
+
+	G2CONF="${G2CONF} --disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
+
+	if use python; then
+		python_clean_py-compile_files
+		python_copy_sources
+	else
+		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
+			-i Makefile.* || die "sed failed"
+	fi
+}
+
+src_configure() {
+	if use python; then
+		python_execute_function -s gnome2_src_configure
+	else
+		gnome2_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_execute_function -s gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
+}
+
+src_test() {
+	if use python; then
+		python_execute_function -s -d
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_execute_function -s gnome2_src_install
+		python_clean_installation_image
+	else
+		gnome2_src_install
+	fi
+
+	# Prefix menu, bug #256614
+	mv "${ED}"/etc/xdg/menus/applications.menu \
+		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_mod_optimize GMenuSimpleEditor
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_mod_cleanup GMenuSimpleEditor
+	fi
+}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index bfc2538..1527dad 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1,4 @@
 AUX gnome-settings-daemon-3.5.1-optional-color-wacom.patch 4125 RMD160 93deeffb9033393077d407ac1407320437c53260 SHA1 8ff8535509e5b4e4dac5609ccffff3c993b28a38 SHA256 8c58ff638e33a93cb10b00e0dcf1b3c4729ff1ac055f183d81956acee34a58c5
+DIST gnome-settings-daemon-3.5.2.tar.xz 1439608 RMD160 39fe0007e4233ba6d9cbe3fdc99733825d3d1106 SHA1 b2d8befa134b786d454752c3e3f0c8141b1a8d58 SHA256 ed9be1e9500ca63c80d8c7e11bb5ae0c21cb392fc7a1c45631765b526ddc1bd5
+EBUILD gnome-settings-daemon-3.5.2.ebuild 3074 RMD160 b29090e4224a020cd23a6b5fe6bb3bcfbd546779 SHA1 030ca2988243528bfa7bb5c5691c80714457e0f8 SHA256 3dfbe95cffb6e6b3549b1d98f48ae6fcefb89fcdc69f5676defe7b80224b6142
 EBUILD gnome-settings-daemon-9999.ebuild 3179 RMD160 7ec565245662016effc47f348e88b1491988336b SHA1 0c223dc233a5ac936894eb956fda1a4cceccaa1d SHA256 d80b31eedaa3087734bc462acdfadd0c30b8451adba92384e59c322f6e4f2329
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.2.ebuild
new file mode 100644
index 0000000..1c272a3
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.1 2012/05/20 10:43:38 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+colord +cups debug packagekit policykit smartcard systemd +udev wacom"
+
+# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
+	>=gnome-base/gnome-desktop-3.5.1:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.1
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-0.9.16
+	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.0
+	>=media-sound/pulseaudio-0.9.16
+
+	colord? ( >=x11-misc/colord-0.1.13 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	packagekit? (
+		sys-fs/udev[gudev]
+		>=app-admin/packagekit-base-0.6.12 )
+	smartcard? (
+		sys-fs/udev[gudev]
+		>=dev-libs/nss-3.11.2 )
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-drivers/xf86-input-wacom )"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	>=x11-themes/gnome-themes-standard-2.91
+	>=x11-themes/gnome-icon-theme-2.91
+	>=x11-themes/gnome-icon-theme-symbolic-2.91
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15"
+
+pkg_setup() {
+	# README is empty
+	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-compile
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_enable debug)
+		$(use_enable debug more-warnings)
+		$(use_enable packagekit)
+		$(use_enable smartcard smartcard-support)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
+}
+
+src_prepare() {
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.5.1-optional-color-wacom.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
+	doenvd 51gsettings-dconf
+}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
new file mode 100644
index 0000000..b7fae39
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -0,0 +1,2 @@
+DIST gsettings-desktop-schemas-3.5.2.tar.xz 228744 RMD160 4fc615fff398f9007e20cb7b5e0121ab83946982 SHA1 b639324257fdc143e3dcc358bfe2f3ff3bb50428 SHA256 a08feef26e8adb9dc3e4a830fe5d1f7f6007c4578fc11a8c16c7f96d1c2678f5
+EBUILD gsettings-desktop-schemas-3.5.2.ebuild 892 RMD160 625b6d885c864e0d1f79fc2defe50c66d1d6c450 SHA1 2fafb5f1ba9260e2d8bd3ce1e5f5a43f0b0b537f SHA256 77ba185cfc4a416c075bdbf6c079de24d44ba61295e49326e2bf91d13fdcca0b
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild
new file mode 100644
index 0000000..7de9a64
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.2 2012/05/28 12:34:25 blueness Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.31:2
+	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable introspection)"
+	DOCS="AUTHORS HACKING NEWS README"
+}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
new file mode 100644
index 0000000..572bf9d
--- /dev/null
+++ b/gnome-base/gvfs/Manifest
@@ -0,0 +1,5 @@
+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
+DIST gvfs-1.13.1.tar.xz 1377080 RMD160 824d75eb94d350e589bea9a970d21f356f978112 SHA1 efb76e7c783d3e8b7070ac1e5dd1b03118344f70 SHA256 97b69d8f13a1996ecd347bad12368dd8f660676d4027e8ef779585e7dd2b5981
+DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
+EBUILD gvfs-1.13.1.ebuild 3430 RMD160 2ec93d14c2f1b09391a010ddbf6dee671213f95c SHA1 5c27fe507fc3ba13327baa6b79b739394699ab3b SHA256 4c7a0d9443adbb2c2b53398643784d35e51c61719c1e37755e92a3b2484a3695
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/gvfs-1.13.1.ebuild b/gnome-base/gvfs/gvfs-1.13.1.ebuild
new file mode 100644
index 0000000..2193c9e
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.13.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3.ebuild,v 1.2 2012/05/29 16:19:05 aballier Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+[[ ${PV} = 9999 ]] && inherit gnome2-live
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+	DOCS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+fi
+
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
+
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
+	sys-apps/dbus
+	dev-libs/libxml2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2 )
+	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 )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gdu? ( || (
+		>=gnome-base/libgdu-3.0.2
+		=sys-apps/gnome-disk-utility-3.0.2-r300
+		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.0
+		>=app-pda/libplist-1 )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
+	udisks? ( >=sys-fs/udisks-1.90:2 )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+REQUIRED_USE="cdda? ( udev )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-bash-completion
+		--disable-hal
+		--disable-schemas-compile
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
+		$(use_enable afp)
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable bluray)
+		$(use_enable cdda)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gphoto2)
+		$(use_enable ios afc)
+		$(use_enable udev)
+		$(use_enable udev gudev)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)
+		$(use_enable udisks udisks2)"
+}
+
+src_prepare() {
+	# 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
+
+	if ! use udev; then
+		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
+		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
+		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
+	fi
+
+	if use gphoto2 || use archive || ! use udev; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+		AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	newbashcomp programs/gvfs-bash-completion.sh ${PN}
+}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
new file mode 100644
index 0000000..5f0afc1
--- /dev/null
+++ b/gnome-base/libgnomekbd/Manifest
@@ -0,0 +1,2 @@
+DIST libgnomekbd-3.5.2.tar.xz 370492 RMD160 154323f64325cfd54dcefcd4df834de7cabc0d19 SHA1 f291b98d3d527f6fa2d441570a59e8ffae77d9ae SHA256 4867e68987c7c892f4d887ded12d3b4fac897eee5eb52f44b216b2a3b3de42d8
+EBUILD libgnomekbd-3.5.2.ebuild 971 RMD160 22c96d6099e5ea3aa435e855db064cd5253078fa SHA1 36466f5f79d54e517f44aff6e54ecdc30dc9f31f SHA256 0358214d742ecee584e90975eded0eb03cb10df917357e31c3c4b4dd9231f0d9
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.5.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.5.2.ebuild
new file mode 100644
index 0000000..77f8f0c
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild,v 1.1 2012/05/14 06:05:55 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome keyboard configuration library"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.91.7:3[introspection?]
+	>=x11-libs/libxklavier-5.2[introspection?]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-compile
+		$(use_enable introspection)
+		$(use_enable test tests)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index af6e0c2..fadd0aa 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,5 @@
 AUX nautilus-3.2.1-delete.patch 1869 RMD160 e730dfd7754dc619327347f3b5a578c9d6dd1317 SHA1 0f40dac0184320d86df3cccbe917084a4aea48e8 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0
 AUX nautilus-3.2.1-key-press-forwarding.patch 1716 RMD160 b158ab5e1ee158f7481b20c672da986f702305e5 SHA1 c703365c3468696b23eb8fa4161cf504fc7e29a7 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05
-DIST nautilus-3.5.1.tar.xz 4580536 RMD160 b5cf369304147bcc29aa3e4daeafa02ad905878c SHA1 6ee9ba9aa637897a25fa5cad0b05fe682d36a684 SHA256 ebfbcd822845c3ac76ff54c5d2d7f2962c79807ec453a7beb6a114ddebefe9a7
-EBUILD nautilus-3.5.1.ebuild 3091 RMD160 e949c780cf4f0a5d9bf3c98166b860b114fb3978 SHA1 0901d3557afe15274e8627203c4b7880ba7e322a SHA256 56c978c2a3071df470184e18d7a018ef7cfc4ce06177972c3725bebe2636afca
+DIST nautilus-3.5.2.tar.xz 4941432 RMD160 e2eee5a018daeb3cb0a3c864df821083bb429e7e SHA1 003d10934622c7bef236dfc1838fedb89c826a45 SHA256 db6037ad9cc9872eddd7f4f928a420f66bdfb9e3075bb7414d9c2794e55ec7da
+EBUILD nautilus-3.5.2.ebuild 3086 RMD160 7874e249f323d723686afba2f08089a1c3c9bc71 SHA1 fd16b8ddeacaddd6814b679b7fd52c208b1505d8 SHA256 b153fcc0c7ed63c9a24f4197137980fe1186f6688cfe036bb4dc689a21b97432
 EBUILD nautilus-9999.ebuild 3112 RMD160 01773394ec991605e85bfdced5d6fb4a0b426be1 SHA1 1ea39e892e6ab745865fe69483dd8914a2f988bc SHA256 f2ce578a2583fe3697bf0a177a8d8d0c0780aa7c0ca64cd4c158b5ad4db292f4
diff --git a/gnome-base/nautilus/nautilus-3.5.1.ebuild b/gnome-base/nautilus/nautilus-3.5.2.ebuild
index 0f01ee9..c1e6b4f 100644
--- a/gnome-base/nautilus/nautilus-3.5.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.5.2.ebuild
@@ -73,7 +73,7 @@ pkg_setup() {
 		$(use_enable sendto nst-extension)
 		$(use_enable tracker)
 		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
 }
 
 src_prepare() {
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
new file mode 100644
index 0000000..ba8dc70
--- /dev/null
+++ b/x11-libs/gtk+/Manifest
@@ -0,0 +1,5 @@
+AUX gtk+-3.3.18-fallback-theme.patch 2841 RMD160 01f69c2800ae57c1e21e22ba5be562061cae20b0 SHA1 0800ab93bd2b1b311ead6bd2a423fec984fb78f1 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922
+AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 RMD160 b21bfb4fdca683e385b08f181ce10922bc1d3b58 SHA1 d74d0fe0ca3058044f22520fdc288e5c0758311d SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9
+AUX settings.ini 96 RMD160 ff8d7e28f097820b15ea1d2168d9405db1a5707b SHA1 92c3120655ba14f163846a22d5c94fa50b0eb437 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163
+DIST gtk+-3.5.4.tar.xz 12969372 RMD160 c477d67c6ca8c2cbed264d758665a706be3c7eee SHA1 3ce0af69bc5c01028d6bf28e32b10c1335a48ba7 SHA256 b169703280e4623ec884a5707ee879f297151bc7e8077d964418655bc00b4b12
+EBUILD gtk+-3.5.4.ebuild 7139 RMD160 62829c156afa451e68f11f0ef507b6bd3ee4bcd6 SHA1 f30fe7aa1e914205cacff0fa00c9ce3a10ccff6b SHA256 5ca5d40d0321919ed5adb38dd56447152b1252c37e2dc4e3860bd62c97d964d8
diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
new file mode 100644
index 0000000..7f5d0a1
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
@@ -0,0 +1,81 @@
+From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 14 Mar 2012 23:08:53 -0400
+Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
+ theme fails
+
+If a gtk3 application is run in gnome2 and the settings daemon uses
+xsettings to request a gtk2 theme with no gtk3 version (which is the
+case by default), then instead of failing to load any theme, we should
+attempt to fall back to the theme specified in settings.ini files.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=654108
+---
+ gtk/gtksettings.c |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
+index 2e17430..354ba34 100644
+--- a/gtk/gtksettings.c
++++ b/gtk/gtksettings.c
+@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
+   GtkCssProvider *theme_provider;
+   GtkCssProvider *key_theme_provider;
+   GtkStyleProperties *style;
++  gchar *fallback_gtk_theme_name;
+ };
+ 
+ typedef enum
+@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
+   if (priv->style)
+     g_object_unref (priv->style);
+ 
++  g_free (priv->fallback_gtk_theme_name);
++
+   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
+ }
+ 
+@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings             *settings,
+       if (pspec->param_id == PROP_COLOR_SCHEME)
+         merge_color_scheme (settings, &tmp_value, qvalue->source);
+ 
++      if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == GTK_SETTINGS_SOURCE_DEFAULT)
++        {
++          g_free (priv->fallback_gtk_theme_name);
++          priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value);
++        }
++
+       if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
+         {
+           g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value);
+@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
+         }
+       i++;
+     }
++
++  g_free (priv->fallback_gtk_theme_name);
++  priv->fallback_gtk_theme_name = NULL;
++
+   g_object_thaw_notify (G_OBJECT (settings));
+   g_free (pspecs);
+ }
+@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
+ 
+       if (!provider)
+         provider = gtk_css_provider_get_named (theme_name, NULL);
++
++      /* If we failed, fall back to the theme from settings.ini */
++      if (!provider && priv->fallback_gtk_theme_name && *priv->fallback_gtk_theme_name
++          && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name))
++        {
++          provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
++
++          if (!provider)
++            provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
++        }
+     }
+ 
+   /* If we didn't find the named theme, fall back */
+-- 
+1.7.8.5
+
diff --git a/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch b/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
new file mode 100644
index 0000000..2e052d9
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
@@ -0,0 +1,39 @@
+diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
+index 9e8e6b1..237a5b8 100644
+--- a/gdk/wayland/gdkdevice-wayland.c
++++ b/gdk/wayland/gdkdevice-wayland.c
+@@ -32,7 +32,7 @@
+ #include "gdkdevicemanagerprivate.h"
+ #include "gdkprivate-wayland.h"
+ 
+-#include <X11/extensions/XKBcommon.h>
++#include <xkbcommon/xkbcommon.h>
+ #include <X11/keysym.h>
+ 
+ #include <sys/time.h>
+diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
+index eca6f92..d59563a 100644
+--- a/gdk/wayland/gdkdisplaymanager-wayland.c
++++ b/gdk/wayland/gdkdisplaymanager-wayland.c
+@@ -27,7 +27,7 @@
+ 
+ #include "gdkinternals.h"
+ 
+-#include <X11/extensions/XKBcommon.h>
++#include <xkbcommon/xkbcommon.h>
+ 
+ typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
+ typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
+diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
+index f3e9d3c..bc26a43 100644
+--- a/gdk/wayland/gdkkeys-wayland.c
++++ b/gdk/wayland/gdkkeys-wayland.c
+@@ -39,7 +39,7 @@
+ #include "gdkdisplay-wayland.h"
+ #include "gdkkeysprivate.h"
+ 
+-#include <X11/extensions/XKBcommon.h>
++#include <xkbcommon/xkbcommon.h>
+ 
+ typedef struct _GdkWaylandKeymap          GdkWaylandKeymap;
+ typedef struct _GdkWaylandKeymapClass     GdkWaylandKeymapClass;
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 0000000..a65c0a8
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-3.5.4.ebuild b/x11-libs/gtk+/gtk+-3.5.4.ebuild
new file mode 100644
index 0000000..3dd5ac2
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.5.4.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.3.ebuild,v 1.3 2012/06/03 12:48:54 jlec Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="X? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-libs/libXinerama )
+	)
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[egl,wayland]
+		x11-libs/cairo[opengl]
+		x11-libs/libxkbcommon
+	)
+	>=dev-libs/glib-2.32
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/atk-2.2[introspection?]
+	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+		xinerama? ( x11-proto/xineramaproto )
+	)
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	packagekit? ( app-admin/packagekit-base )
+	X? ( !<x11-base/xorg-server-1.11.4 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+
+	# Apparently needed for new libxkbcommon headers; bug #408131
+	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
+
+	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
+	fi
+
+	# Non-working test in gentoo's env
+	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+		-i gtk/tests/testing.c || die "sed 1 failed"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am
+		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
+	fi
+
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf="$(use_enable aqua quartz-backend)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable packagekit)
+		$(use_enable wayland wayland-backend)
+		$(use_enable X x11-backend)
+		$(use_enable X xcomposite)
+		$(use_enable X xdamage)
+		$(use_enable X xfixes)
+		$(use_enable X xkb)
+		$(use_enable X xrandr)
+		$(use_enable xinerama)
+		--disable-papi
+		--enable-gtk2-dependency"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# Remove unneeded *.la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
+		|| ewarn "Failed to run gtk-query-immodules-3.0"
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}