Version bump for Gnome 3.12.

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

39 files changed, 2055 insertions, 71 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 316c1c803193..9564847c2ea8 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.400 2014/04/27 01:46:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.401 2014/04/27 16:48:32 eva Exp $
+
+*gdm-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +gdm-3.12.1.ebuild:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Patrick Lauer <patrick@gentoo.org> gdm-3.10.0.1-r1.ebuild,
   gdm-3.10.0.1.ebuild, metadata.xml:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index e6a041d1dfbf..ebeefeaa63e0 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 49-keychain 181 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140 SHA512 72b9a7d0a9dc17c4f51795b665a1a8db035a3423b35769fa68c8c471e76d9ab698d1841c3e354efdafe6167e8358b018028268d7a17d0750bdcc55cbfe481290 WHIRLPOOL 4ab8099ea4f66e2935a930ea9d8ab9202732689206ee2b57eb3946692622bb4cd56f5429d40a28b7d2beaf1c2261610462f96a7362fcae2e5548da23396a2a61
 AUX 49-keychain-r1 193 SHA256 32e0b028eb6d1189fc82d72ef62661de78c491bcfa099e7ac652d6b4daa1598d SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21 WHIRLPOOL dd8f9249e2f1c1c60131e1c030bfa4a8c251cfba083d55847273ac906bbfb27576ac29e4039c70269592667024b8a4871060139717796eed0edd3a341edbc4e0
 AUX 50-ssh-agent 243 SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042 SHA512 b955253fcb58ccd2cb7d0c30eba01f240821a1ee12751975407dbd3331d54460c75654c5d1931b6245b03ce7966d660cdd627c2b6f0f41aceeed97173d9e3195 WHIRLPOOL 7c93297c37ca66ebf34dc1515e2033c75af80a43f1ac69ebb842256927b2719c42117f661a79a673f079e0974cefd73affd9e376189488905238506eccee1753
@@ -20,10 +23,19 @@ DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
 DIST gdm-3.10.0.1-patches.tar.xz 10116 SHA256 249b0676498477aaa4da70ea1f39d9612222b1dbd8100cbdbd7b46a37998ed94 SHA512 f4cbf9f96c8f999601bf9e940af6db7172f79013355779869cbbf4be0a6bdecc808bc536a0267608095cd2af362226c291c8f8deac5a642534d31af5007cdbee WHIRLPOOL 51cdbf01ca64154d65152fff69ed3476619c850358a87dae9a765ce2c0bdea2c8a74a3ff2cb6c2660799b519b4e54e1631f0898422c5461ccc2b8551d84222b2
 DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7 SHA512 9c108fd70324c17bd93c1f9ad74a87404350041c4d0c45f72c233a1414202b107502f0154486d8c8cceb9f0826275608045539c8bc96cbc6ef5350fc55d5462a WHIRLPOOL 34dd4595ad94822703b4c9d49ce413b64a93e0ccd50bd757dbdf79b592fb714b24d9c9b87d852d04d62750bec3daa3039e5d0d70ff03611c698f63b3b91c9404
+DIST gdm-3.12.1.tar.xz 1505728 SHA256 41a009252bf491dadd7644b3e74be5c9364b1971b519a1a9ef31257180c74913 SHA512 351282d9e2f4b6441a91fe2fb33110b28d157ebf41faf7756ba2d14f4a3a417908fbbd1883de300e6ae2acf3186674f2e6932bc1873838f91563afd53a9250ba WHIRLPOOL 950789b3fea58d5720835a0b1cd28a6c258d81cd6d86669471c802f8229f21b95dea4a10ba56af5ea9d345c728015b24bd2c88d86179c254d7361cc021074f83
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
 EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
 EBUILD gdm-3.10.0.1-r1.ebuild 6962 SHA256 ab28c2d841eb31d97d76b6fdb578cdef12cc223a79321d82f3605be8217b68d3 SHA512 0c6c5da1d801fa4c1fc76480deff37a3108d8f50ee82396bce1fbdb48009cc9d15fea40d3025db14744b95ec413610c2f6edd87b8a6e4289da185f78936b42e0 WHIRLPOOL 5de0995ca535fba4afa3fbe1b80fec0486d85df5547c0665dd8140bf3d707c2a3025dc8aadbb18269210d3949ac4019af40a91b6cb8ed002a09a2ed5b0934f98
 EBUILD gdm-3.10.0.1.ebuild 6653 SHA256 168259b626b5039d82f029aa49eab8e4626407d0ef7ec631d72ab099627222b6 SHA512 65dfadc0e5b802f6e8009be6202d720059139138223776faa61de3381e5078d773d2d7f39207060d37c376d0bc949d28997d3a728d36fd837367c826e9782309 WHIRLPOOL a0ca3a518bce7c30ef9b3c1ec67715b08a303e16002bf1d34c9e3c8f73672367a7ee613fa7a22d9862ca38761cd263f4b907f7f9ebfaec2f3938e50ef46c095b
-MISC ChangeLog 61420 SHA256 7a0ab321143f2b87679cdb71ba5a49868c559d425aaa645027427e02a92d39c1 SHA512 92b6100adcc702b5650cc67feafbf6435b300f9d805c9c893e3de2eb6b98c40e8bce51bebe3b2e481857960bd6aa93f3c5b0035d49a156d69ef4d7a1796424df WHIRLPOOL 2d7b7c3938c1a0d57f203fbe0d8c67c8a07d58c165e16c18cebb6c0715777f4c9300e1d41dd557f609fc3f64e05733a89c6beeb796efcb02cbd271d4b16df183
+EBUILD gdm-3.12.1.ebuild 6796 SHA256 5fc2fd0781f3a516582fc5920c22179f93badc8f4d151aa741ad6efb349a88d0 SHA512 3ff50e2f1b570c237557ef169a706c5c86ba9637c0f00583b5d52af41b7dd34a91036d5d0dfb60c8d28ebdafd7c5a335cf805ea7be41c326f7a65feb6415a9cc WHIRLPOOL 4ad6faa551364b7566694af7d649bc2ca578347830c8f72040e4f851da80795233ebe4cd136decf934c06b01e134f2ce930a44f48a3319d3cff3ba6baa022e8b
+MISC ChangeLog 61549 SHA256 b6292712208a4fd2d121da250deb12d3aab2d7b9b10bd1e0253278b06ad64536 SHA512 010bc475cf12728869be6442b5cb6f8d3df06e7cd42b1859d55f3f5cd9fd8489308e93e5e62f9f7d3c8849bf7b1f730dfec068a5f229075b9ebcbfdf02e956f3 WHIRLPOOL f91d0686547e84aa350c874c6294e7f8fe2cdb5ea968657b39bde14d393017a32741e021732f2946ff5a0369181b46e53c90b2bd026c8e7410f1b3da41650201
 MISC metadata.xml 734 SHA256 ef71a7383585093a248a016783da93359975e3d91a4dbc14572d209fe7a44106 SHA512 512897b71e9fe9b1bc119f57ccea852341de68970b6c113d281a7422d6df449c28744301f46aa38190c5f9cb7b4ddf6ed37a44034201e592c097106a92c83b78 WHIRLPOOL d59b6d8ef1776254e52854e08896ae563c48dcdd5c9ca139f7b80085a81931aeb589f926f713e6cd8b24b8023c06e89d47b2ca0958bf63a3917ad398c76f3d16
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlNdNOIACgkQ1fmVwcYIWAZ61QCgjrwFFDjiKjy2yG2Zatw1OtQu
+n2MAn0nbLg8QQdUf/KxiKAlkcgnapz0m
+=1jZW
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.12.1.ebuild b/gnome-base/gdm/gdm-3.12.1.ebuild
new file mode 100644
index 000000000000..0674e009ff2b
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.12.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.12.1.ebuild,v 1.1 2014/04/27 16:48:32 eva Exp $
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 pam readme.gentoo systemd user
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/GDM"
+
+SRC_URI="${SRC_URI}
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-Sampling-Plus-1.0 )
+"
+
+SLOT="0"
+IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
+REQUIRED_USE="wayland? ( systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
+# nspr used by smartcard extension
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/gtk+-2.91.1:3
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	>=media-libs/fontconfig-2.5.0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-apps/dbus
+	>=sys-apps/accountsservice-0.6.12
+
+	x11-apps/sessreg
+	x11-base/xorg-server
+	x11-libs/libXi
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrandr
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	virtual/pam
+	systemd? ( >=sys-apps/systemd-186:0=[pam] )
+	!systemd? (
+		>=x11-base/xorg-server-1.14.3-r1
+		>=sys-auth/consolekit-0.4.5_p20120320-r2
+		!<sys-apps/openrc-0.12
+	)
+	sys-auth/pambase[systemd?]
+
+	audit? ( sys-process/audit )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	plymouth? ( sys-boot/plymouth )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+# gnome-session-3.6 needed to avoid freezing with orca
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	gnome-extra/polkit-gnome:0
+	x11-apps/xhost
+	x11-themes/gnome-icon-theme-symbolic
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		app-accessibility/caribou
+		gnome-extra/mousetweaks )
+	fprint? (
+		sys-auth/fprintd
+		sys-auth/pam_fprint )
+
+	!gnome-extra/fast-user-switch-applet
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/randrproto
+	test? ( >=dev-libs/check-0.9.4 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOC_CONTENTS="
+	To make GDM start at boot, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.\n
+	\n
+	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
+	for smartcard support
+"
+
+pkg_setup() {
+	enewgroup gdm
+	enewgroup video # Just in case it hasn't been created yet
+	enewuser gdm -1 -1 /var/lib/gdm gdm,video
+
+	# For compatibility with certain versions of nvidia-drivers, etc., need to
+	# ensure that gdm user is in the video group
+	if ! egetent group video | grep -q gdm; then
+		# FIXME XXX: is this at all portable, ldap-safe, etc.?
+		# XXX: egetent does not have a 1-argument form, so we can't use it to
+		# get the list of gdm's groups
+		local g=$(groups gdm)
+		elog "Adding user gdm to video group"
+		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
+	fi
+}
+
+src_prepare() {
+	# make custom session work, bug #216984
+	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
+
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
+
+	# Gentoo does not have a fingerprint-auth pam stack
+	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Show logo when branding is enabled
+	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	# Xevie is obsolete, bug #482304
+	# --with-initial-vt=7 conflicts with plymouth, bug #453392
+	! use plymouth && myconf="${myconf} --with-initial-vt=7"
+
+	gnome2_src_configure \
+		--with-run-dir=/run/gdm \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		--with-xdmcp=yes \
+		--enable-authentication-scheme=pam \
+		--with-default-pam-config=exherbo \
+		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
+		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
+		--with-initial-vt=7 \
+		--without-xevie \
+		$(use_with audit libaudit) \
+		$(use_enable ipv6) \
+		$(use_with plymouth) \
+		$(use_with selinux) \
+		$(use_with systemd) \
+		$(use_with !systemd console-kit) \
+		$(use_enable systemd systemd-journal) \
+		$(systemd_with_unitdir) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable wayland wayland-support) \
+		$(use_with xinerama) \
+		ITSTOOL=$(type -P true) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	insinto /etc/X11/xinit/xinitrc.d
+	newins "${FILESDIR}/49-keychain-r1" 49-keychain
+	newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
+
+	# log, etc.
+	keepdir /var/log/gdm
+
+	# gdm user's home directory
+	keepdir /var/lib/gdm
+	fowners gdm:gdm /var/lib/gdm
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local d ret
+
+	gnome2_pkg_postinst
+
+	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
+	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
+	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
+		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	readme.gentoo_print_elog
+
+	if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then
+		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
+		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
+	fi
+}
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 382fcfceb551..659f42bd68a9 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.148 2014/04/18 10:54:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.149 2014/04/27 16:50:39 eva Exp $
+
+*gnome-control-center-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-control-center-3.12.1.ebuild,
+  +files/gnome-control-center-3.12.1-optional.patch:
+  Version bump for Gnome 3.12.
 
   18 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/gnome-control-center-3.8.0-paths-makefiles.patch,
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 2d3c5a7694fe..4f6b6f144828 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -9,16 +9,19 @@ AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd2
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822
 AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d
 AUX gnome-control-center-3.10.2-optional.patch 13785 SHA256 d8a3a8a060b7f8715b4510c5b2b83c6825312ea5eea6c1728439118dc532113f SHA512 a6dde875ef42b6176ebadcf85e3c2b0b52f1bdffdd51544756c06fdf072a3182f4f2ae440bf1426c3516cab464d339413783176d15e59d6c9e3784e5e8bff8d2 WHIRLPOOL dfcdda7e20902a121178af0f099c2f6be231ce1a9a3ea37bf17f0a16d2c01291608bbb05b9dec353c4cfc231639608e3d88ce57c83cacbb654752098623dd5b4
+AUX gnome-control-center-3.12.1-optional.patch 14081 SHA256 23abccc022b2e2fe5d99dd82b6e076651469859a15bc44b91bb7f28ad895f1ad SHA512 0969b16675056ba1d10bf77352d6dc5012239277fe02da640771b8400bf8afafbc456f3cce7b4eb52d230d460a3869151c917f88703b2c3cf58a6addfdca527a WHIRLPOOL c92c638e53a18e43a100bb383bc3df3e6b7e59d3d95cd89867d8b4e052571845d0a15bbc2ecea889246703fcb130a15887cbb7904f45ea73708636e108fdd654
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
 DIST gnome-control-center-3.10.3.tar.xz 6821248 SHA256 059172d5e7f8b6c385bcc1b73f966375b92a8456dd5eba8d7f8b75907c3324a6 SHA512 0289b5cbe56aeb10f1f28ef9fd66fbe3f3b3f977a1b1a5e8cd5d9089a8d8cae088b0d1abc44ae5a6a461d0a511cbd28446da8371738dbe4147889f40ee37822e WHIRLPOOL 9c5e496d3064c3a66bbb9bb8ede9153199b0e67beec872a3d334b10ac095215354aada524efbe4ccf7d1e3e935ab23f1ec2308a2aa5e9686225a9c5b456ea01e
+DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722
 EBUILD gnome-control-center-3.10.3.ebuild 5031 SHA256 cecb2cfb86e529f150184460a136b0f0aa9a40ef6c35dffe49ac9722e6bb2aff SHA512 d426f5d379e0da98e34b87df98af17bef99317577f08efae74e737a24df6bb96d2c21da90cb226d480a1e0f17056bb84a789b94192594ab5f8fc0d88b33d8c25 WHIRLPOOL 9988b42515f54ce6d40ddd18af0864a6a46e13014b548ee02024a5f0e648834af012c13fbd5ec50255f93f743ec6acf9b08449cad76e61a8ea2efb68bd746603
-MISC ChangeLog 68327 SHA256 db5ee248fe9115a6beb2d99bb358c913828d8a3bb2222c2db83b0f43fdb9986e SHA512 fcc648c420abc45b39e95b5bc1d6f73cb942723fb5ddd545efee3b78c8bd6c101944b123ff894c78428ed3974c5668fb9ae4fbb9a0b33acd5a8889f98c721a14 WHIRLPOOL b8bc402eabf67b176f471fbe81be137be0acd21e59e9dea4f2969913c489f26f8ae0068f7a1bb76556d6bf26ae462300d76b1124e027de9daadb1a1b2d1f00b4
+EBUILD gnome-control-center-3.12.1.ebuild 4977 SHA256 e4fe53120b6185d7427f04c4627b66299dda7afa67b76bb0a7276093a1d18c0b SHA512 7f73a7c4a9c482bb4028cef2408257747e3fc327d224e50724cbd0d1cd58ac8ccd3467d8b4b6cd6f828a4edef569a5736a9f770c4f6f75b8ccd573f8c6cfaaf7 WHIRLPOOL 1ed4196e39b64b38610234feeb14b94672a0bb698a602f24d34f2b30b60dc821e474f1ed5de522dce30571d1c9911281da42b831bb615a2f93f52a2511d3bca5
+MISC ChangeLog 68547 SHA256 24d0c8ebdc7a6274f69e1acade9e828e3f3bd3fa7b3d68d64da8540cdd1118de SHA512 9612a8d38ba41c3bb87088cf50ed500f21aab256af7491a89465d135a4249b72b1f1e11d589d2eb4a92cf880c3be9bef85902e83e4cf264ed12a370279977ef3 WHIRLPOOL ad385c6abf2e8cf58dee97f2173ce515dff06d49020df53ffb0bc4c72ac1a83c8ab95dd21c6d45a4e0de9c1a0e7f0faea62e7051b6ed15ef97970ad08c3a0c99
 MISC metadata.xml 626 SHA256 c9a75efab859ae7807307d84c8c849b4b1c3874bfbb598934146295b5a3f4328 SHA512 be29f660669a454fa1d237dff0045fb574ca9919351e685bb15866a700995ee2de2c7379a60441d08830dfd1d5d5c43a74e731e2a2e92a13109959a42353a87f WHIRLPOOL 1b967098d536cffb46d6b1ae877fa131c7672eb17dd0f49d62dc97a8b6157efb6371664b63a71269aa951e3f59b68e6bce86d037204f4f43242b649081828fcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNRBE8ACgkQCaWpQKGI+9QRtACfc/Z2sH3TFqg/7SClTl9vv95q
-mjwAn0m808hP3n7LCU5xp0JcqQtniGwm
-=X+tO
+iEYEAREIAAYFAlNdNWEACgkQ1fmVwcYIWAYvoACgtl7YnIaoOZm4zi8c0HyRHBkY
+C90An10eSr6s97LJhS20isE5ZYcC4idf
+=WQY3
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
new file mode 100644
index 000000000000..6662e0bd1242
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
@@ -0,0 +1,383 @@
+From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac                            | 146 ++++++++++++++++++++++++++------
+ panels/Makefile.am                      |  10 ++-
+ panels/user-accounts/um-realm-manager.c |   9 ++
+ shell/Makefile.am                       |  10 ++-
+ shell/cc-panel-loader.c                 |   8 ++
+ 5 files changed, 153 insertions(+), 30 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 511f78d..f82108e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++AC_ARG_ENABLE(goa,
++       AC_HELP_STRING([--disable-goa],
++               [disable online accounts management panel]),
++       [case "${enableval}" in
++               yes) WANT_ONLINE_ACCOUNTS=yes ;;
++               no) WANT_ONLINE_ACCOUNTS=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++       esac],
++       [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++if test x$WANT_ONLINE_ACCOUNTS = xyes; then
++       PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++       build_online_accounts=true
++fi
++if test "x$build_online_accounts" = xtrue ; then
++       AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  libsoup-2.4
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++               colord >= $COLORD_REQUIRED_VERSION
++               colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++               libsoup-2.4
++               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +250,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+ 
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1,
+-		  [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++       AC_HELP_STRING([--disable-bluetooth],
++               [disable bluetooth management panel]),
++       [case "${enableval}" in
++               yes) WANT_BLUETOOTH=yes ;;
++               no) WANT_BLUETOOTH=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++       esac],
++       [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++       # Check for gnome-bluetooth
++       PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1,
++               [have_bluetooth=yes], have_bluetooth=no)
++       have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -292,15 +353,27 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
+-      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+-                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+-                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+-                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-                        clutter-gtk-1.0
+-                        clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+-      have_wacom=yes
+-      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+-      AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++      AC_ARG_ENABLE(wacom,
++                    AC_HELP_STRING([--disable-wacom],
++                                   [disable wacom management panel]),
++                    [case "${enableval}" in
++                            yes) WANT_WACOM=yes ;;
++                            no) WANT_WACOM=no ;;
++                            *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++		    esac],
++		    [WANT_WACOM=yes]) dnl Default value
++
++      if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
++                          gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++                          xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++                          gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                          clutter-gtk-1.0
++                          clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
++        have_wacom=yes
++        AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++        AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++      fi
+     fi
+     ;;
+   *)
+@@ -310,16 +383,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+ 
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+-  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++              AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++              [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++    AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++    if test "$KRB5_CONFIG" = "no"; then
++      AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++    fi
+ 
++    AC_MSG_CHECKING(for krb5 libraries and flags)
++    KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++    KRB5_LIBS="`$KRB5_CONFIG --libs`"
++    AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++    AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+ 
+@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Bluetooth panel disabled])
+ fi
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** colord (Color panel)])
++else
++	AC_MSG_NOTICE([   Color panel disabled])
++fi
+ if test "x$enable_cups" = "xyes"; then
+ 	AC_MSG_NOTICE([** CUPS (Printers panel)])
+ else
+@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xtrue"; then
++       AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++       AC_MSG_NOTICE([   Online Accounts panel disabled])
++fi
++if test "x$build_wacom" = "xtrue"; then
++       AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++       AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ 	common \
+ 	background \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	notifications \
+-	online-accounts \
+ 	region \
+ 	info \
+ 	sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ 	privacy \
+ 	sharing
+ 
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+ 
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 0849160..58d50a6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+ 
+ #include "um-realm-manager.h"
+ 
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
+         g_slice_free (LoginClosure, login);
+ }
+ 
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+                      const gchar *realm,
+@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
+ 
+         return code;
+ }
++#endif /* HAVE_KERBEROS */
+ 
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+                    GObject *object,
+                    GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+         LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+         krb5_context k5 = NULL;
+         krb5_error_code code;
+@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+ 
+         if (k5)
+                 krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++        g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++                                         _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+ 
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index ad7a68f..cc968ac 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -52,14 +52,12 @@ gnome_control_center_LDADD =						\
+ 	$(top_builddir)/libgd/libgd.la					\
+ 	$(top_builddir)/panels/common/liblanguage.la			\
+ 	$(top_builddir)/panels/background/libbackground.la		\
+-	$(top_builddir)/panels/color/libcolor.la			\
+ 	$(top_builddir)/panels/datetime/libdate_time.la			\
+ 	$(top_builddir)/panels/display/libdisplay.la			\
+ 	$(top_builddir)/panels/info/libinfo.la				\
+ 	$(top_builddir)/panels/keyboard/libkeyboard.la			\
+ 	$(top_builddir)/panels/mouse/libmouse-properties.la		\
+ 	$(top_builddir)/panels/notifications/libnotifications.la	\
+-	$(top_builddir)/panels/online-accounts/libonline-accounts.la	\
+ 	$(top_builddir)/panels/power/libpower.la			\
+ 	$(top_builddir)/panels/privacy/libprivacy.la			\
+ 	$(top_builddir)/panels/region/libregion.la			\
+@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+ 
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+ 
+ # Dbus service file
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
+ #endif
++#ifdef BUILD_COLOR
+   PANEL_TYPE("color",            cc_color_panel_get_type        ),
++#endif
+   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
+   PANEL_TYPE("display",          cc_display_panel_get_type      ),
+   PANEL_TYPE("info",             cc_info_panel_get_type         ),
+@@ -87,7 +93,9 @@ static struct {
+   PANEL_TYPE("network",          cc_network_panel_get_type      ),
+ #endif
+   PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+   PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
++#endif
+   PANEL_TYPE("power",            cc_power_panel_get_type        ),
+ #ifdef BUILD_PRINTERS
+   PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
+-- 
+1.9.0
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
new file mode 100644
index 000000000000..7ac0c04aac0d
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild,v 1.1 2014/04/27 16:50:39 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.11.1:3
+	>=gnome-base/gsettings-desktop-schemas-3.9.91
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/gnome-menus:3
+	gnome-base/libgtop:2
+	media-libs/fontconfig
+	>=media-libs/grilo-0.2.6:0.2
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99
+	>=x11-libs/libnotify-0.7.3:0=
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/modemmanager-0.7.990
+
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0= )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.30
+	x11-themes/gnome-icon-theme-symbolic
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+		>=x11-misc/colord-0.1.34
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_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
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Gentoo handles completions in a different directory, bugs #465094 and #477390
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		shell/Makefile.am || die "sed completiondir failed"
+
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	epatch_user
+
+	eautoreconf
+
+	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+	# We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	# Upstream think they should be removed, preventing compilation errors too
+	# (https://bugzilla.gnome.org/704822)
+	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index e02d8b3dfab3..daa85abb7698 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.325 2014/04/26 18:08:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.326 2014/04/27 16:50:35 eva Exp $
+
+*gnome-desktop-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-desktop-3.12.1.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gnome-desktop-3.6.3.ebuild,
   -gnome-desktop-3.8.4.ebuild, gnome-desktop-2.32.1-r2.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 0d97f9add2cb..6cedf9a8b54b 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -5,15 +5,17 @@ AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 SHA256 3a2294ff8f8082d3be9d709efbc4757c518cbad57980cdc7f4efeef366a756bb SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 WHIRLPOOL cb09db77b55cc34ed6a74babdeb0a71b7a3c8de0c3897615bf8a6dc3b037d5dfd4a56084a913855e5b97a0c12375c1c7941435d8e5385c0a683a5533983e8030
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
 DIST gnome-desktop-3.10.2.tar.xz 1062876 SHA256 d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632 SHA512 0a45dc718b269c29984e7ea073152678fe88f35d4a0ea29821add96dc44eccf987f2eb526a045c8c4d9c75daac7694f3f3e7e54d3c52901f375914365a0f1091 WHIRLPOOL eb8ec2dea008427beb8ac84607f5779ec5b28787f3c243744f822549c65f30ec0eb43f923d9f8e0967804f7c6f01bfe7b52da12cd3b17f6197581816954d2d41
+DIST gnome-desktop-3.12.1.tar.xz 1093332 SHA256 853604f55158343d7220a557f4705aa3270770fa47f5c0453d7fdde61f8c0691 SHA512 e2e5e6fb6eb9b9e29311537617f4409d7c120713759d642dc54283842acdf0cb531dd4fc00e68e64dc6e3dafa93f81a8df0e3be6cf44a62e43daee798787f6dc WHIRLPOOL 7ffdbcef764986c3a5ac088aa4f423e607f3ea5911c7c37d079699d4685b5bc5bc3f67ffa972cebce2df048c0a00f25b89c79d47f30c724e1d9870677b73d5a2
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2436 SHA256 9038e4b059105ae4c9a4bb7796261e60f843b521c627d01b8a63f65a00f8d7b8 SHA512 7706d4d4d8cf1317b9d0b557f05fbe492286ae22df03553605ce426ae73058ed0ff1345a76a41d5441f028176f33d798da3f34b1ab14f41c8ad333205892a9a6 WHIRLPOOL 366f7a6020f8f5c0496ab7a362c06c22be0858ef60406c5b65fc3f08bef8b5f3887617212657b8d51385924abf917dfd6b5cdfcd091b97cc0aa77a3ede61c771
 EBUILD gnome-desktop-2.32.1.ebuild 1678 SHA256 dd140c9a7ebadffbd846cdcf12063a90ab242a64834d34b0a8d3eeb90f531b6f SHA512 4f940e58e2863bdf8d0ad04cfdeb2f9bfbeb1ec79fc060e6e5b51fca0502d646f5fd8adc3647bd2dcc7ff345a2f3becc13613e32d534ed38fc78b0882e9fd7bf WHIRLPOOL 316bc8030374b6f6e6361af286c790b6fca3f42b7f470241ac6ee1614858aa97d3926a057fd764dfec700c347db65207799d29765ab8178a7f1a7f8c480640c6
 EBUILD gnome-desktop-3.10.2.ebuild 2028 SHA256 d43e90725cff77efd12f454e41e098a8cd5c46156f4dfc9efa638fb030523ff4 SHA512 d4af91b81dce38efb186ed7b58cbc45514bc857659e372cf70942b47ba2ab01b57fd9416a7f4b3b628a3e66ea34a4114e141fce0fad75b268d1f35fd167e15b7 WHIRLPOOL 41a2987416c2df5ee2bf99aa2412e8d4dba517a0fdf47886939a3af58802aa1c14b2d1cbe34e77e86bfdba7ffe895fc841a45511b747f8415c309b004943b964
-MISC ChangeLog 44301 SHA256 d376627a4a3c373e17d2a7e6b3f4675f9e8cf9265706b424832f940ee1f1e271 SHA512 50d9bb48e8aae56761f882922336d2eab20312a99c6c65227ef69c9f5a36b9553f8575e88d19f0a6d9c6a13e7a9c471d27bde8ce61da1b92b425ad2c22a0ceeb WHIRLPOOL a3b540f77a6839238eab4365368b71800038b14ddbf073da9329bb7942c97fa8aa3f06d003a23f1ada717aa16bf5bf7fd0c0fa7785b2b10204bf974cc19f9cf3
+EBUILD gnome-desktop-3.12.1.ebuild 2008 SHA256 cad198085b7c05fa4060fe2cde42db3607c25143f7a2089b0dd4d0ce84c8f14c SHA512 ed7bd80837e64a54b486a50eaa336d00dedc8cad4637fa3cfb589a9f771c039b638347fd85237b91711c03de554b0ddd4fd2d04cfdd6e52d07eedde7493141be WHIRLPOOL e4a637ca14ca92e4f6b3aaaed04c9cb584ac1eae3b53bcde8efd920e04a9c99aebd8f877ec7cfcd998c5ef09ec3fbeb2f1773acbcf5118b1e5949b5e4a7d980d
+MISC ChangeLog 44454 SHA256 79561866527156ef7291cc788d1a93d07f7754d44508589ca6e7fd6b1351f758 SHA512 70d140535465c3f78123f3a23097705c3066c328f37a7a521aadfcd6144d09fad7fc74b38a6b99c9a590f921283e8194526d21f779e791228c65429d272dda39 WHIRLPOOL 6cb7f9ecbdec184d0ff57ee79a60e08c744f946e074fb5508426ac2cc2e95c4a7d08f395ccc898388c74e9ef29a63143ec81f2be91e936614ebeea72dce02766
 MISC metadata.xml 260 SHA256 963e6a57764d4be649262b46c80463a08be9f9d17442becdc59b6bb93991ba6b SHA512 953029172fb8243080bf818a116de3318527568efde018ef9fcd00ca64664041a110a6a9d083f7537985b97bcc3f0c4cd2638dd829924dcdea2248147e8a8625 WHIRLPOOL 4b49b8d1aeec77e2f6716e2aaa8ba84d88e7d521e415802aad82857d0c46a63fc902467d56ae3dd89cb147c7bfa337c88d76bedf64ed11b832fd6397a1439336
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb9jsACgkQCaWpQKGI+9RGkwCeNEwfhLWKCtROmJ2zCorJuK1p
-vAMAn3aqKE8ZUp0uiDJGHdPYpi8ZBeyM
-=LJdf
+iEYEAREIAAYFAlNdNVwACgkQ1fmVwcYIWAb92wCgoh4l0sEejRrkbgC+6gZ6xkbz
+0VwAoLkyM2+ekynFffwFDSzwvhdjHegg
+=rkGE
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild
new file mode 100644
index 000000000000..829c5822e5f1
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 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.12.1.ebuild,v 1.1 2014/04/27 16:50:35 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/10" # subslot = libgnome-desktop-3 soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.35:2
+	>=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/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2
+	virtual/pkgconfig
+"
+
+# 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)
+
+src_configure() {
+	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).
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(use_enable introspection) \
+		ITSTOOL=$(type -P true)
+}
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 0f879d0d0481..f2849a28bcba 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.250 2014/04/26 18:12:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.251 2014/04/27 16:53:02 eva Exp $
+
+*gnome-keyring-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-keyring-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gnome-keyring-3.8.2.ebuild:
   drop old
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index b4e2d2534d64..92eed6398d37 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -5,14 +5,16 @@ AUX gnome-keyring-2.32.1-fix-undefined.patch 783 SHA256 a7b0d99728960af4e81e9794
 AUX gnome-keyring-2.32.1-glib-2.32.patch 1355 SHA256 042bf9bc95f8e37bf9733531cc4d38db5c33d382f15152afdd7288ea09145fee SHA512 5745e64d77ec48cb8fe5b76bfc902f97749ee125e0c6db6ee7aed87f996cbae92e3c835792e76e33f49386ac8a9a4ec3613212f6ff5f470d038f2abf737c4aa7 WHIRLPOOL 23c45dd081eebaf9da75d159c71c3addd40e6f15b88c167ae932c6d3e0c261296c5e9222a0ed8cdf47045e9e30dc9f27bf331cb0482b26acfd5d2ac3f0ca611a
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
 DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 SHA512 ed37e64aed6963ee97894df58e380af2efa4995515891f36bce9aadeea29eef8b25d28d1b30adc0a3e912eb9ddf7662de92dc7b4962ed5aeaacaa7b60dd5b39b WHIRLPOOL 4e025fa3a3f9744ffb377e5dda40c3c194f3f4929805f530b59638d4750eb49f1975311b25b97b980d41305fa5062c11866924dd5d2bb711e9b0b03e64097c06
+DIST gnome-keyring-3.12.0.tar.xz 1162892 SHA256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f SHA512 2eeb19b9a9361dfae3627f2e292d7b23f298bc7c77b9c1bcd275baf2ff91ac002bf9897d3ef6d9ebe3e343f31be4813b00c014b2659b2f16748ba3b87ee57938 WHIRLPOOL 71e67ab2802bbe3ef32b6edebf9a075d265130510e21b05485ad3ff556bb2e3698962c95e32d34d2bf3768ed9b5f2af0ef8ad2e8c15c7209be7097efa314f6f6
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2049 SHA256 0612aa59a77710f1e5438213184f40243e36edd831dd2e22454a236a6469367b SHA512 fa86ef0001d0083e5ca44a16ba53e747b0d9c969c386ba3e9cd98d6d3437dab73a2219318bd4c67511701074ed5e8d87f4a0805097890837cf1ea00a1a0293a7 WHIRLPOOL 3b035dc1317011d2611bd5d7fb9ecd89f49f8387a71c8138c3a9321f4fbf8a60de96c2605ef687ad1e1360194b3c362228560259742350557a3b59bc72f11314
 EBUILD gnome-keyring-3.10.1.ebuild 2367 SHA256 602ad146c803d828e64954899e6cb658bc596e9d15df9b94c276a2432267e465 SHA512 f07e9c5a4ce60b2defc5b165578d0c6fe092605398a8ff430ad2cd86eb44f223b71e53784300470e1474741b58ba6499c2b75df3c70904795098eebbfe318619 WHIRLPOOL baaca416658bef3471d3020f94ffb8f7eaa6d7ecf0f897e7f17969f6ed0d5926de37a38a4c8bd1e8c5b9207d9a97b468d8e6cfca902999086872183320f1f002
-MISC ChangeLog 36494 SHA256 f24c53ade688252ebfb1ddcbd2c18931e2e4763d95e5c619b4a7c8152ceb599d SHA512 4170683311648da903a9bb7e82d619d82731a4d4cbf3caa9f949f8ada4ab6d9924c62a9c5bc754497d54539da0ced035f74f8f158c2f72833d8ed883b8cdfad1 WHIRLPOOL 3e6d04ef5ad2f57a6eec8cf48a7c18a5b37448be70e3135cdc2cef477461b34a5e272ffb160346335a06b56bb621734151c5f67dbbb9a37aa75b35900a669e46
+EBUILD gnome-keyring-3.12.0.ebuild 2436 SHA256 b975a553b9d460fb241b2003da9c43b03fe17282dd0b75dffa4c4ae30957aab5 SHA512 2a3d69dc1fdb71b825106d14ad7658a0292a847e3235dba2660d0111d8a751dd391a289eed9c9f3f72d60da3d1e2a79aac86f6811987f9e4ece834367438fd61 WHIRLPOOL a3e192c8125dfc0da0d3c6b0c77c2399227032fa077e1d167360e6ea2bce6af598f67ef25fca54775ef544c1eebb0fe364c262758c04c30100ba23f0a7abf46f
+MISC ChangeLog 36647 SHA256 2603871f4418a81b8d904af3ed40062571a00e5c9e6e56555b17def927783d82 SHA512 66669e4ae8e4d29bb29d0d39adeb440321cd287b03d7d1c1de992ce1edc7804494bb553cb09a42d26e65f96404f2f1ad968cd62bb3aa2116f4dd2027e48169e3 WHIRLPOOL 6d75c7c65f20f7c3bc1be6d2fa5d8272846655ae46e20295716eb52ea83ebf5e53d4cc82b91121bf9c7a02a9032d075b68ff69c1a4b69312a52c27656d5f59eb
 MISC metadata.xml 645 SHA256 247a1437483f3ea8d7df3f99c065953686d0026f33120a3763fc46670278260f SHA512 a5f543871ff2cc3e56b1d703703338feed369933a6d183489e258b5e60b6b7246379a926d11e0697e3380a6bef2289beea48ac208691b16ea6a09306e44043aa WHIRLPOOL c2d5faa8a1d05dca37490fadb7932ec520948c8e0c9962778f05f4f2127b7bf86f31915be2cbbceffbc01f04769480bf15dae985c7575cc4667fe3afe3d97e7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb9x8ACgkQCaWpQKGI+9TXHACdH1rzz7TFQepX6PYxR1v7SLMM
-/YcAniO3nEscKht/ZqdHT/9RlpiWKSXU
-=V/Qj
+iEYEAREIAAYFAlNdNe8ACgkQ1fmVwcYIWAYikgCeMJe0rgkXf+gmXWcAHgbu7jpc
+rbwAoMLWuV6HFV3o/+LYSHKFtK2ezbFX
+=waHH
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
new file mode 100644
index 000000000000..2f04c033c3d7
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v 1.1 2014/04/27 16:53:02 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps debug pam selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.38:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	# FIXME: some tests write to /tmp (instead of TMPDIR)
+	# Disable failing tests
+	sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
+		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
+	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
+		-i "${S}"/pkcs11/gkm/test-timer.c || die
+	# For some reason all pam tests make the testsuite retun 77
+	# which is considered an error but the test framework,
+	# but all tests are successful
+	# FIXME: this is only for overlay, report upstream, make a patch !!!
+	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		--enable-doc \
+		--enable-ssh-agent \
+		--enable-gpg-agent
+}
+
+src_test() {
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
+}
+
+pkg_postinst() {
+	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index a3f176c38984..884fd60ab66d 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.334 2014/04/26 18:22:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.335 2014/04/27 16:53:14 eva Exp $
+
+*gnome-session-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-session-3.12.1.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gnome-session-3.8.4-r1.ebuild:
   drop old
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 601495392b04..fef1cf83aafc 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -18,14 +18,16 @@ AUX gnome-session-3.8.4-blacklist-nv25.patch 592 SHA256 2c0894db69a13678d12047f1
 AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0bd4eef0dec61b07fa9e72d8ca990e64bcfa42dabcb SHA512 dff7f096d562f8b7b661b6eda1d65a3f9a992cd4cd22604034f44ea77ca72b1282b9bced4702ca24e89185f97de54b4a554877b7cbc8a1ca9f55ef15030f3ac9 WHIRLPOOL faa03513c86fec3f313c3a1a14e40d86d2d35b636d5ad8aa70f17ae51424e205ae99dd00670ac41aaa2465e7281c63bc48574a41d5978ca78bf832a51a574ad0
 DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
 DIST gnome-session-3.10.1.tar.xz 767336 SHA256 f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc SHA512 a17fdd1943c118f025a740b22de1f5840a2f8a1a9fc7f8a2720deccf69097391c2d05e6115416c40c5530de60326f6bd729444dd7a3b2aeff115fe547ad94d8f WHIRLPOOL 12237e7bf0bcfb78a9435d9b71937849d1e07f86d111ed143fd0ee0598a0c198eccdf9ca62e1c3229ff1f00c0baded92a98516d712e0be8d3c1aae9586b3bfec
+DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517
 EBUILD gnome-session-2.32.1-r3.ebuild 2972 SHA256 b67ca3d7c561adccea184b8a70e047a0009ead24da57d3a9d508a43f79289674 SHA512 c1ede08752fadb66a2d95f9b01a567170e72943ad71c6bbf23f12e1b70516e0b2de10a394b7811507e84b49164f303f715059b7d8972cfc2d6e66f76826c50f6 WHIRLPOOL 37a7fb42d6d44f76f7d23f7a3158589d9381e2c830e40e593a8b51b70ef00f590a7f7dae3ae0439e80e275a43bc607f47aca31ae2d69c113e7452901021e4379
 EBUILD gnome-session-3.10.1.ebuild 3465 SHA256 abc7ddc604c909e4ccd9af0742c9796672ecc0eb219610f1a2ab8d7cb0064960 SHA512 ca6e64566351acf88a589904fd2908a63c4012e8a0ce66b7a43d6986f56d92693a92df5297c43fa8ed9f2a0cffd3cc10a5d06ac3e85b72c71578a3ba4844586a WHIRLPOOL 8a34cf69367b2ca95591a3cb38f96e9d714d6b3209aee9e7f8648b64b5104197659dd8636fd2615b0edf2a72a07dfc80b3f842181077039b159c1043b4ba773f
-MISC ChangeLog 50400 SHA256 fd93d1b6983698d0531f887dfd8395f5f3599d206568297c4bd41dfb528b9679 SHA512 99f9939f214a03bbfe8b6507f1310bf2885ca1aaa07dba76b33ad6d11de8a6a0e3781415f7f7ab9e62f7b7a22bba2684abf327fba22f59e66254459bf590c8d3 WHIRLPOOL 5f2319641fd6de36fbb2a01fe9e9a2712f07785dcdf5b4c2940684374adcb1157f3bb0892389a015179afc2c08bc9be7a854a8933984e72c2f78bdfed3e134ee
+EBUILD gnome-session-3.12.1.ebuild 3441 SHA256 dd13e44ac5e17076b24b0ef509e9f9c07ed6589a470e48d6642c53861f333c54 SHA512 b1670357092e5cffe9e9fc91a6e1eed0815b8982785240cc3602cf844f3ac9cab8769c7ddc1f6932e0daf7afc1547b5fc5d73d1bd8ae6276831acd4559d1fd28 WHIRLPOOL 6187fbc7ad8522fa48ccb1d93a18faac6a9b61d361af4497820503d38ee915b44103478b757de77590569a80878b338e471aa79cdfa84d8877408f01357f39bc
+MISC ChangeLog 50553 SHA256 faffd7044baf8ec36e9165b6b11b8001f30da9ba8e8662410787cdfeef92e7e5 SHA512 f4e6735a243f309a2b83b02055a3911a7b83b764b15812d08f641438407be380a3f5d8ad8ce6d9a7f9f7bec5b8193c45d3efe060b476a34fa2f387775146d2f1 WHIRLPOOL c387fb310729e9a513009383f32de0a4fb9831ed6335b445c7466d712b3d1d50ab1e055c9bb86da03350b8e80cad068cd7af7a78f0005142c338f111dc868086
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb+YQACgkQCaWpQKGI+9TrXwCfYvfSezy+a2xxVwkHNP8XAsIR
-I/MAn10PaEutzbj7ZNH6tPMtVgxu1k0M
-=3YqZ
+iEYEAREIAAYFAlNdNfsACgkQ1fmVwcYIWAakXACg0xURzJU4cddXImh6Ok0Kej4E
+VEQAoMCt7UA5fHjcFngZJQVmhjwwFHK0
+=VxjR
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-3.12.1.ebuild b/gnome-base/gnome-session/gnome-session-3.12.1.ebuild
new file mode 100644
index 000000000000..d96e19d25923
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.12.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.12.1.ebuild,v 1.1 2014/04/27 16:53:14 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.0:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.7:3
+	>=dev-libs/json-glib-0.10
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gnome-desktop-3.9.91:3=
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo
+
+	gconf? ( >=gnome-base/gconf-2:2 )
+	systemd? ( >=sys-apps/systemd-183:0= )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=x11-themes/gnome-themes-standard-2.91.92
+	sys-apps/dbus[X]
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+src_configure() {
+	# 1. Avoid automagic on old upower releases
+	# 2. xsltproc is always checked due to man configure
+	#    switch, even if USE=-doc
+	gnome2_src_configure \
+		--disable-deprecation-flags \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--enable-session-selector \
+		$(use_enable doc docbook-docs) \
+		$(use_enable gconf) \
+		$(use_enable ipv6) \
+		$(use_enable systemd) \
+		UPOWER_CFLAGS="" \
+		UPOWER_LIBS=""
+		# gnome-session-selector pre-generated man page is missing
+		#$(usex !doc XSLTPROC=$(type -P true))
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	dodir /usr/share/gnome/applications/
+	insinto /usr/share/gnome/applications/
+	newins "${FILESDIR}/defaults.list-r1" defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+}
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 29774ec4b4c5..b8acfc2853ea 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.137 2014/04/26 18:24:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.138 2014/04/27 16:58:01 eva Exp $
+
+*gnome-settings-daemon-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-settings-daemon-3.12.1.ebuild,
+  +files/gnome-settings-daemon-3.12.0-optional.patch:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -gnome-settings-daemon-3.8.6.1.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index e01ae45c7eff..9cfb0d2c3826 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -8,19 +8,22 @@ AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 SHA256 9d56379de2c2
 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9 SHA512 20e4a503241204986c784e1a35287900025734af8a17ed81447f8c71b03def83e90e485f1f3e73ce86e73f6f2a913d262bf14b1a0a4cd67609ebfadd862eb11f WHIRLPOOL 9aa94447bf256f9262f793ababc4ab057b388344857aa3ead252a79486e157e15973609cccc2500861fb1975ae626b19eba4b0ce55d41df6833a56f45340063f
 AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0 SHA512 86f8baa39280bce8ae586bc31ad67e730589a6d56c51c85608df562e034faa64725798637ab2ec04ef416d8a9f23c136c0605a0941783900fcfdffa2bae530e9 WHIRLPOOL f99c386c75376808c3fbaefbe77cf719a8f9ca5b05fa41458e7db4c39d927c40400aa3cc998bc945d3a3b75d707063434e5160705d0914bef71ac06f7067cb64
 AUX gnome-settings-daemon-3.10.2-optional.patch 3190 SHA256 c4d84d2fc35ee254a637fbc24ab8504d492bd6e0171bda40083222d9c1f30da8 SHA512 33be2bd93c8603a5a7a6c0cfd53ced1413d1ffd6c8ef502c17625c4c766623bde3105a929a0bff88cdc3072594ffd9dd7b3d3eba583e3a5cb7b1bd32399c903e WHIRLPOOL e9ef1d3320970bb8ad850bc5dc00954a03fa4163daebbf398cae5fe6d5279776c1b346388b2c841c052bcca9ce9011578146610fafaeb410122040d68ed2e8a6
+AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe
 AUX gnome-settings-daemon-3.7.90-optional-color-wacom.patch 5877 SHA256 8ff3403c00715bb674d01291588d541794ea795803e4165c7003d6b9652bbde7 SHA512 b7167df5843d90c379076d3bb4f8c247bcabd755f197c3217fb39df2123681fe619896f3d5a2729e969b4af9c47820143c594bbb5158978b2056d744f689c707 WHIRLPOOL f7a185c44539bd2cc8cd89de0ed3afeef0e1cf00326b08d25ad21570c72f22755f02568e6dc9e68a45a56ee2d6fb571dd72689271098ac3c7976d96b888a6dce
 AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 SHA512 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a WHIRLPOOL 6608a9470666d943e0f39a4cadb36a1ccffbe8b40bcdae97d93b3d9b676da0c3efb33d5be1accaf2066760de6a4a36db16c94a093965f2f8da29511464ec2071
 DIST gnome-settings-daemon-3.10.2.tar.xz 1648652 SHA256 808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264 SHA512 4e937bf178086c3582a7072ce6f2db60b84dac1171ff8344b7b90876b415f0cef0924403308f86cd73f08d6490ae011d533447356c59086e16f41732f1860a87 WHIRLPOOL e1711c2bb9dc4270dfca8aa2f5f9744669a1fa674b64c5aacce55e2b158fe819523a89e02c82086b1fc42cd0b17a274b9ee38e1c450c36371768be0bf8df8d8f
+DIST gnome-settings-daemon-3.12.1.tar.xz 1633548 SHA256 639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c SHA512 496182d9e01e97f59465bc5b9b48881d4ec85aefd0d1c5018645d5524deb7fd01022efb32c3daa8cebaef12ecffb746ac1346072c3074949d6cde5f57cca00ae WHIRLPOOL 0ce1c17b90a6d1fd114d8ffc0948bc7817fb2e37bb3415d6b98faf0ee64820b6bd90d138e69bc7dc2d1134c821f94a59597fff24893a614922e7e12cf52ab500
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
 EBUILD gnome-settings-daemon-3.10.2.ebuild 4189 SHA256 fd76ac79b47081700742b3a4ce416572b6e5388c5050cae0a1657d9d9d5a1115 SHA512 a27f8f949cfa7b22ab73bea8a646d6c1580c69a80429cb50642468740670e6c109ac08981867503d39622057ff59a24b5069de5e6e6601e1fcded759ef6f46eb WHIRLPOOL d40a19dca20852ce5783a274384ce0c56a53797841e2186e6c0930e37121eaee2501969a8dcfa4b3fe5b8a1357bf734ba70f381f53452672fe1a13a6c60c2ecc
-MISC ChangeLog 28384 SHA256 b35cc0d8cefba93980c82f470eedcca229a1cb7d4ac9e2f4e2162e3d05d8d896 SHA512 44ba10193856e56607a252f3106248e53fe975c83ce259e408a6cafed0b1b670d215cfc1e4e642418dd13c2a0557884427f88046316d6db2fd5a7b5e9ebff287 WHIRLPOOL 02f8d8599886b8efdae0af8fb1e6b63eaf16f23d6b36b75c083c0da2dbc7efe125b5f62f8cd7ee726d4cc1289b98767369774334bb5a841a7b892885a041ac5f
+EBUILD gnome-settings-daemon-3.12.1.ebuild 4225 SHA256 ff8b506300f708a29fbcd1e2ef07c2f9a77c50a21e8f698e322e6204cda09923 SHA512 f7f51f890b7f532885b3fba59866638df9045ebfd47e2b2b32d96a932f27f13c53041d6d8225dfda25f6e304c2ff4931ef47850242d639543331748cfe432598 WHIRLPOOL aa2030218082cc623bce0fab4188eebba1d9d46cfb186e7e20acf8885227562ba6957dc8d89ae68c15a80eb7b626a84010a9d23ac53bf4b63dd771c404622e71
+MISC ChangeLog 28607 SHA256 8e82d0a46df2fd87b75ead7488bf32e7383ef75cb8ee3045db7368c1d15705ad SHA512 0b588d88096b802480ac3405675fcea7dc7db37d556012ef848202b5cb24b63f020b760cf62747e8c89d32f7672fbe364eb185ceccff5fcc2574f85d75bbca9d WHIRLPOOL b6b06981f8ad15cae18323b7809446975e7523fd9b785273c2e485284b70688a18dd88fdd95728cb5d5df2102e3d56a69edba1b4817cefa7b338788b944a7a5b
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb+dUACgkQCaWpQKGI+9TKzACfRbw2h5kGetWs7YLKOWvufrNG
-qvcAnAtT94/0HEPtxErzxcj3/9WURvfh
-=9mev
+iEYEAREIAAYFAlNdNxoACgkQ1fmVwcYIWAaDZACdFcGG/J8F8WKb+rSvJIOLsJLy
+KDQAn0FSPxAs+ozUSPfbFLdv0NO1MaSq
+=x/sj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
new file mode 100644
index 000000000000..cb117d70e445
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
@@ -0,0 +1,82 @@
+diff --git a/configure.ac b/configure.ac
+index dd95dd4..03d651c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,7 +248,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -279,15 +292,25 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
++      have_wacom=no
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++        AC_ARG_ENABLE([wacom],
++          AS_HELP_STRING([--disable-wacom],
++                         [turn off wacom plugin]),
++                         [with_wacom=$enableval],
++                         [with_wacom=no]) dnl Default value
++        if test x$with_wacom = xyes; then
++          PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++          have_wacom=yes
++          AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++        fi
++        AC_SUBST(WACOM_CFLAGS)
++        AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 04f8e2a..55ed94c 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -21,6 +20,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
new file mode 100644
index 000000000000..b5b56093675d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 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.12.1.ebuild,v 1.1 2014/04/27 16:58:01 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 systemd virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
+REQUIRED_USE="
+	packagekit? ( udev )
+	smartcard? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.7:2
+	>=x11-libs/gtk+-3.7.8:3
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/librsvg-2.36.2
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-2
+	>=sys-power/upower-0.99
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
+
+	>=app-misc/geoclue-2.1.2:2.0
+	>=dev-libs/libgweather-3.9.5:2
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? ( >=x11-misc/colord-1.0.2:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/udev[gudev] )
+	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	udev? ( virtual/udev[gudev] )
+"
+# 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
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
+	>=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
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
+	# Apparently this change severely affects touchpad usability for some
+	# people, so revert it if USE=short-touchpad-timeout.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
+
+	epatch_user
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable i18n ibus) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	Xemake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 9c9d22a4888c..4d137d16fb94 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.73 2014/04/26 08:22:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.74 2014/04/27 16:59:22 eva Exp $
+
+*gnome-shell-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-shell-3.12.1.ebuild, files/gnome-shell-3.10.4-bluetooth-gold.patch,
+  +files/gnome-shell-3.12-bluetooth-flag.patch,
+  files/gnome-shell-defaults.patch:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.10.4-r1.ebuild,
   gnome-shell-3.10.4-r2.ebuild:
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 1f8a22a7779b..f8c3c7e6bb6f 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -4,22 +4,25 @@ Hash: SHA256
 AUX gnome-shell-3.10-bluetooth-flag.patch 1777 SHA256 e792a8d9cf2e352eaff19826c2fb3ab2b7b13864c3ff0d7d646f003c647d8c88 SHA512 3dc2a949a0b139dcb51df1e353ff4ca90631e57858c0be1d80467fda32aa080de18d26b593d97854f3c2e5a5ea93b168c37c4ddf9006fded5afddab87af44233 WHIRLPOOL 8ed260aa62418131f63dca628b09b83ef4b963e25dd79f194f413bc6961066055b1f49d875a9739a747c4f17d3700dca212ddceb2e4be14b7dd6602f9ca97610
 AUX gnome-shell-3.10-networkmanager-flag.patch 8935 SHA256 5fdbc3206b3fb67f216128d988b90a3be9070ac1abfebc8ab33cbf95478849dc SHA512 7cc0d58f12559195f065756c06bb6511ac4dd87d3f8c56204aeb8d0d4145dbc7bcd223fd780a68b6efe089c28d970e4099d816112e557258e4c967e5c8a5dfdf WHIRLPOOL a03e4164c809d88d8e389d4073086dd2272588962ab434c006536677e9f1d305b4e892ed1c524088e9b1da0698de6b869148546524b00f631fb25248145d0ef7
 AUX gnome-shell-3.10.4-activate-workspace.patch 1734 SHA256 6bb2f0c3e07e70d57c0fc8d2a6e5fa6344d4a5c89ef615e58eb3715023ad108e SHA512 4298925152e1484b86d5067bff077cbc0d468fbe3bb95389fa31683ab185e70347cfb9c77756f03651750d6d37c7fbd2587d5bcdb4400f31a8a52d544b52878a WHIRLPOOL 22ac28dbf8555ef248596eec1ee9691969d73f2b75d767c1ba97be58561597ded01056a4025dbfeb9aa0abfdcf8ba2118895f3f1c499e59763b06c4966c4bf43
-AUX gnome-shell-3.10.4-bluetooth-gold.patch 1194 SHA256 e6882c21ae2cc9b61792008ae97e31efff2b99c7e43148ef9bf155d4ce0b074c SHA512 b85d8e82b39512c2a243e0e791be5e071b245b51aa6825e239008898b4c1a7263fcf3c09281ce2699366a79516a2820da0fef4d202c7aecc871818fdda12b799 WHIRLPOOL 1633b01d3b5fae4acb65d64f53d46712844f5d106e6ad3b0289a738cea1c4ad65cba57fc58bfd15076dc49d8f9113ce568fc44815d9a0fbe654713f60f498e40
+AUX gnome-shell-3.10.4-bluetooth-gold.patch 1198 SHA256 b92fd31343348e0c7ce3420899e04c454edad388a6489ab19be6ed2461c7dc41 SHA512 1e5eb7aa8a36e7f2bbdde25e0d9796c3041035f6213a8b6b344fc9ef511f8cff65868d09f1e83ca6dc2a5ca01fd7f4f112435fba0b5eb487736d206dcdd32249 WHIRLPOOL 0f78e39364b2f508778bb298ba52759944148d93aee924db4a2b79941352b7b70fd1c3bab5f6f58d1827e83ec86c95ba36530a8f79a5bc2ad84b37f910e16af5
 AUX gnome-shell-3.10.4-broken-crosshairs.patch 7540 SHA256 f0065fb557368644cef74ab25d5e67088f1888c5d95487c0df32f0def75aa4fb SHA512 1a56d68b735abcf4be52206f4b8499904d7561f7d372d7e465cd837bcfd751e80433a0e7dfdaf3833076313bd8311bf12f918744d8b296d750909755414e5204 WHIRLPOOL 3fb856432e83bf1bb53f9409c5e15040ac7490f65bc8e6c7c47b13d6b43114d8f0a12766ba20e7cf652ef3c59b88684822f4aa56efec94fdaa3173203f088ea3
 AUX gnome-shell-3.10.4-fix-background-manager.patch 5674 SHA256 ed257838b97dfb63f2e0ddfd338a21efe5485e6c0b54da6e9d82a3aae9326c2f SHA512 7da462a0b8f5e99f49f3bd66afe652fa1dd9f2d366a60b4349098183d08f6f6a631a9063edba5874d45f5c07b0813a1ce0933ac6a8eef4fc708bab8a1b78ea2a WHIRLPOOL 03cefd14412e3f526f0417452ca37d024e7e1a649ebdb52673117d420147540ae96a342cf1af7f63414091bf0d5f0e3abe9e992ac6c129197e771553ce3ac645
 AUX gnome-shell-3.10.4-restore-pref.patch 1324 SHA256 7439ea6ad9342d084b5212fea8e662b614edf256fe08f155c985c83fb6e27e81 SHA512 3dd50e163ca658bc7a0d4bac584848abb8265c973adcd040d702e69bdb6877cfb09f48b6a574ee064fd2c1feef5248d63e59a5c0d423ee4841a178f02c3cacb5 WHIRLPOOL 1cc2af4a0b43af7500f241ea12d61a39f77e15cffd5bb1893e713183286a5286342a051ced766cb7052dcb7b6e604c53989ce4c6363f08ffec449b70ec42b382
 AUX gnome-shell-3.10.4-scale-factor.patch 1223 SHA256 f5912f9c079ce6a7774c9f3a615b0ea86441cd43437f20ac6f79307abd1328a9 SHA512 089a03b56cac4d51cddf5bf38076b29b4b7659283c50b619445091cf78fe762ddc14bd5cd5db4a10a3a988647bf16c89a27ed4674802a412cc6008916dfcb4d2 WHIRLPOOL e96454a6b1c7fbeb9ea8db681b9e67a0b7774c889ef9e9ffe1d6a24efc6ef62aa2ac8b6c1197c7a3e7426d3c4878f4c7b799dc5b9dcec5e171ce5b1d746596f9
 AUX gnome-shell-3.10.4-wired-network.patch 5804 SHA256 14f61ee92b4f01bc39454e121ea9cf62590ed0f178d111eca000a0ce5c4028fe SHA512 d04dfb8461e970a926b4ef4a386fd01ac8964c2d6a37a8d4d399f0419fedc3a2159f5f6b480ca94225845656d36076a8ebb83e4f0e1734915035aae6a321190a WHIRLPOOL 2923e3005649f4cf6fef3419694df365907abd630a94c5a8fd2511632bed45776cb052a904b96b0e212266cf93b1763a0553abc007986477e0291315a3b94b2d
-AUX gnome-shell-defaults.patch 889 SHA256 83ddd289cc3a6ab29a7e8b4a19d2d10a7ffd05700a85f288fda8ccc077b3aaf7 SHA512 440d6d87569589e234a3251d001262d59aa835b279b9535820b83ed11ed0f7e00ce945814f0a3212024e3bda5cd04b49c1bbc6e98703cd6251cd1fa0baa6d1a1 WHIRLPOOL 20532252b8af581bcb243d5884ad0214f2921fffa3ee7190d8d12cf4b3b5cde758fd1ac21afc721030c239082bb708750f1f502e4ab856e32cdd3bc515ad1756
+AUX gnome-shell-3.12-bluetooth-flag.patch 1894 SHA256 1da61704c51128de9b17fcca022e9c4d8d1d3b7def9b3e7ef50e2bc6d13fa256 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 WHIRLPOOL aa98031a3152d570342fb249c3609d6387b6dea1d451e71ecf880c7de412aa493ad414db7e15217bac0775625419fa8ede13c5f61e055ad735d60dbce86fd6e6
+AUX gnome-shell-defaults.patch 1266 SHA256 eeea87bd5f02b3da83435c69d44a57e85d0ad58a62f72a350b55e0efac0f2584 SHA512 36c08779466884e1dce41460e56d0b9c82ca07bf2fee491d48604ae6f511dccfcf2bb3fdb1a7213aa47f08d0ec37da798465480ce12444dd22711bb4daec642c WHIRLPOOL 04669a7b93b7440e55d6ce71f43b9a90df531e6a72093c3ac61f775213a66a6e856538b5836a5962169d54746591dc246e12e3d532b2cc6af022092c82b9efe6
 DIST gnome-shell-3.10.4.tar.xz 1521256 SHA256 e082f6847eedbbc474ffe4bcb3dfe51054eb0e4c5ddab440d39afed78526b726 SHA512 bb69942bb1ab97e896ed69b48360c99a1a870074b0bfe16dc546fcb3d23a970b95b7f3bd3f9bac85a73a0fc0c5d7c8b8c08054d28abb5aa80b7b79c918532167 WHIRLPOOL aa2678a9b19e2c92823b0d555d1b88869112796c3876433a3886086a22a25b4cb4c77908d7e82c76430fbfba535af0f2b9791b79be5c7aa3f57575c8c3372d4f
+DIST gnome-shell-3.12.1.tar.xz 1541420 SHA256 d5a475f390d992de03ccf8ffeafec90595da700594eba9fc0688cbb1652b5516 SHA512 a6c811def3933107eb9e69614bb484ef7cf308ee32a7447560d38e0d2115fddd8ba9fb839c683222c5c7a9691db9afded0ddc0725f498a0adb79670b544cb3bf WHIRLPOOL cbe84c2ae7d9d78e2151ad01a34ddeddbcbcc6209434d2cb6590bd931fb56a8a52c9b480b3ef4421832076fcbec25f42658d9568a3147538a860594670a1dade
 EBUILD gnome-shell-3.10.4-r1.ebuild 7773 SHA256 96e311e5efcccf7245eeb3502654b058816cdaff435a3663b42a86dfa921a031 SHA512 751da3034006ea4951e74fdba4d4c9cc2d31c656246e69edb43cac4ad2dfe29b7cc543dbeac0676f5c98e0d3d4f44120e1fec51cceebf249ef620a6837f76cfb WHIRLPOOL d94c88699a2d5242dcdc2984c8db57747a7cd238647f327083c6b520655e5c20f9aba814fb14177a69f5db1246ceee4de41dbcaca0fd9dcdda5de11c5db6fcda
 EBUILD gnome-shell-3.10.4-r2.ebuild 8351 SHA256 6d2e8f862c021133af436dcfa9025edfd842a24c15403db58ebccd30e1866c9e SHA512 1ce0b9408216fa0a12158738d5a98516f110a5072216b7d8ffcb3c80e6bb6611bafddc0dea0aad76f67917c7b192ae22f063ed36be1ec4fa9a955bd9fa4d39f3 WHIRLPOOL 3779a8daaa0b117d114af9fb373037b772fa9de33e16c7a1e24120a191fd7d25a80b268275b06730d51b6fcc45933eacb10324e19f0cf510e33b7fc3914b0ca1
-MISC ChangeLog 16301 SHA256 82916b8a76b4faba89ba1d1bad83e53e0b0f0b9e47a270b29401f68a9a77506b SHA512 7d99dc13e123553df032dfdbf4f63ddeda0479c343dd0ebca1738c38b26953032ebb02d11b8aceaf1ff2b7682cd8a0bd46e4e5358f42ff5bb2b0e95086d22c3b WHIRLPOOL 59a7fbf2be8d97f9b9e88d364969674814e2e55fd763a23c7c544140c481be5fbc6891818b4c08dec15b85c6a37727fe0c288bdfde2dbafe00d9ed6f4deec8af
+EBUILD gnome-shell-3.12.1.ebuild 7552 SHA256 57f2a00a68a24991a2a3324d47b5b541f42107e93b8afb9bd318ab75b6a1c59e SHA512 bafc80a21aef826ba2072fbf90ceecd739738991588425dc791c4860dca2d282f7eb364dbb3c0accc653e335ce358282b1f2bff3caee6a77f3fe61333e8bf61e WHIRLPOOL 4e43b9cb48539172be05a443859ef7509eaa6dfff5ce2c1cd777dc8cd85f356e9c4b83f2cd9ba39dcb671226396464a4612740e6a4db6e1cbf258ae023503456
+MISC ChangeLog 16581 SHA256 d6e01eae9b9c3513bb44c5240e6c28b9d1d0e7154a1278ed324782bdb6259954 SHA512 348d6672ced5e235f715e7b9438ec3d65017d181ab7ba85e376b56485a4c068abc41878243659788bcc68952d2e72bb9379f14338a4692249bd3ac90ef30454a WHIRLPOOL ad245934343e071e078271175fbd29947fea12eb734754e98e4a3829055c883794fcc7f2fde867c7aa9c33f9367af71d7406e3d61573efeb380eec203ceb0017
 MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbbMYACgkQCaWpQKGI+9Q61wCdFHc9/IguKzexgSLvzSy6AAvn
-WdQAn0zV9CCLFzAs9e2R+Ts2PP55FAf7
-=FiH5
+iEYEAREIAAYFAlNdN2sACgkQ1fmVwcYIWAaQigCfcG8dIbU67AkAxt8csLF6KuEP
+QcAAoI/X4VG7fh3cqTSkIbbKNBX5paQm
+=k3rg
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
index 544648b62a12..b688dd623cfb 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
@@ -1,7 +1,7 @@
-From 92ad0e5a9dca44249639d71a089bfd7159ee6f65 Mon Sep 17 00:00:00 2001
+From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
+Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
  ld.gold
 
 For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
@@ -14,10 +14,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=726435
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8041052..a4aefde 100644
+index f489a56..79838a3 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -301,7 +301,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
+@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
  libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
  
  libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
new file mode 100644
index 000000000000..2fa93af25cd0
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
@@ -0,0 +1,50 @@
+From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Thu, 28 Feb 2013 18:48:32 +0330
+Subject: [PATCH 2/3] Make bluetooth support optional
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+
+Ed Catmur 2012-01-08 13:46:22 UTC
+libgnome-bluetooth-applet is a private library so they shouldn't be linking
+against it anyway.  I tried to work out how to tell libtool to add it to rpath
+but got totally lost.
+
+I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
+so I can at least merge USE=-bluetooth.
+---
+ configure.ac | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a30e65..aa710f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
+ ])
+ AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
+ 
++AC_MSG_CHECKING([for bluetooth support])
++AC_ARG_WITH([bluetooth],
++	AS_HELP_STRING([--without-bluetooth],
++		[Build without gnome-bluetooth library (default: auto)]))
++AS_IF([test "x$with_bluetooth" != "xno"], [
+ PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
+-        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+-	 AC_SUBST([HAVE_BLUETOOTH],[1])],
++	[AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
++	 AC_SUBST([HAVE_BLUETOOTH],[1])
++	 AC_MSG_RESULT([yes])],
+ 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+-	 AC_SUBST([HAVE_BLUETOOTH],[0])])
++	 AC_SUBST([HAVE_BLUETOOTH],[0])
++	 AC_MSG_RESULT([no])])
++], [AC_DEFINE([HAVE_BLUETOOTH],[0])
++	 AC_SUBST([HAVE_BLUETOOTH],[0])
++	 AC_MSG_RESULT([no])])
+ 
+ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
+ AC_SUBST(CALENDAR_SERVER_CFLAGS)
+-- 
+1.9.0
+
diff --git a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
index b88ca809599a..80634c100d19 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
@@ -1,6 +1,17 @@
---- data/org.gnome.shell.gschema.xml.in.in~	2013-07-30 22:57:44.000000000 +0200
-+++ data/org.gnome.shell.gschema.xml.in.in	2013-08-23 11:19:00.002182266 +0200
-@@ -32,7 +32,7 @@
+From 4fd7696fc9f392a11b91fa3fc7fe14ac7734ee62 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/3] Alter list of default applications
+
+---
+ data/org.gnome.shell.gschema.xml.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
+index dc27e47..e8de0ed 100644
+--- a/data/org.gnome.shell.gschema.xml.in.in
++++ b/data/org.gnome.shell.gschema.xml.in.in
+@@ -22,7 +22,7 @@
        </_description>
      </key>
      <key name="favorite-apps" type="as">
@@ -9,3 +20,6 @@
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
          The applications corresponding to these identifiers
+-- 
+1.8.5.1
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
new file mode 100644
index 000000000000..1b865e8088f6
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild,v 1.1 2014/04/27 16:59:22 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +i18n +networkmanager -openrc-force"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# FIXME:
+#  * gstreamer support is currently automagic
+#  * mutter/mutter-wayland support is automagic
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2[introspection]
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.39.1:2
+	>=dev-libs/gjs-1.39
+	>=dev-libs/gobject-introspection-0.10.1
+	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=media-libs/clutter-1.15.90:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.12
+	>=gnome-base/gnome-keyring-3.3.90
+	gnome-base/libgnome-keyring
+	>=gnome-extra/evolution-data-server-3.5.3:=
+	>=media-libs/gstreamer-0.11.92:1.0
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	>=net-libs/telepathy-glib-0.19[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-libs/libXfixes-5.0
+	x11-libs/libXtst
+	>=x11-wm/mutter-3.12.1[introspection]
+	>=x11-libs/startup-notification-0.11
+
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	media-libs/libcanberra[gtk3]
+	media-libs/mesa
+	>=media-sound/pulseaudio-2
+	>=net-libs/libsoup-2.40:2.4[introspection]
+	x11-libs/libX11
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	networkmanager? (
+		app-crypt/libsecret
+		>=net-misc/networkmanager-0.9.8[introspection] )
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Pull in polkit-0.101 for pretty authorization dialogs
+# 2. Introspection stuff needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. Systemd needed for suspending support
+# 6. xdg-utils needed for xdg-open, used by extension tool
+# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 8. IBus is needed for i18n integration
+# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.101[introspection]
+
+	>=app-accessibility/caribou-0.4.8
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	media-libs/cogl[introspection]
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
+
+	!openrc-force? ( >=sys-apps/systemd-31 )
+
+	x11-misc/xdg-utils
+
+	media-fonts/dejavu
+	x11-themes/gnome-icon-theme-symbolic
+
+	i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+	# Change favorites defaults, bug #479918
+	epatch "${FILESDIR}/${PN}-defaults.patch"
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
+
+	# Fix silent bluetooth linking failure with ld.gold, bug #503952
+	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
+	epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not error out on warnings
+	gnome2_src_configure \
+		--enable-browser-plugin \
+		--enable-man \
+		$(use_enable !openrc-force systemd) \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+src_install() {
+	gnome2_src_install
+	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
+	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}usr/bin/gnome-shell"
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}usr/bin/gnome-shell"
+	fi
+	# Required for gnome-shell on hardened/PaX #457146 and #457194
+	# PaX EMUTRAMP need to be on
+	if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+		pax-mark E "${ED}usr/bin/gnome-shell"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "GNOME Shell has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
+		ewarn "drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]" ||
+	   has_version "media-libs/mesa[video_cards_r300]" ||
+	   has_version "media-libs/mesa[video_cards_r600]"; then
+		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa."
+	fi
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}
diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index f4e723c5eb52..ab3a37e57d3c 100644
--- a/gnome-base/gsettings-desktop-schemas/ChangeLog
+++ b/gnome-base/gsettings-desktop-schemas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gsettings-desktop-schemas
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.66 2014/04/26 18:26:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.67 2014/04/27 16:59:55 eva Exp $
+
+*gsettings-desktop-schemas-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gsettings-desktop-schemas-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -gsettings-desktop-schemas-3.8.2.ebuild:
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 7f5324497d55..e74e36bc7ff6 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 AUX gsettings-desktop-schemas-3.8.0-metacity-theme.patch 812 SHA256 bd824f23bcc5e43e797ce9b4c641b7fa02c0a7d22e5fbaceba44ae8900b47fc9 SHA512 c173fb35b1e112aaefc5c10bc027080fc250102c57bcad8507f318d9f5a7b7cd2017234b076e5f98d658fe13efedfb69ab6153dd87681ed95325e7926183a9b4 WHIRLPOOL 1f61507a43de082cf0c1fff4d63d4bbd4436d20a06dd4833b14edd5c6d6089b0b4f76d57bc11d991e3c1deeb341808fa8078ba767a9c45a083a6ab0c8c94e12f
 DIST gsettings-desktop-schemas-3.10.1.tar.xz 468072 SHA256 452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811 SHA512 42e7dc19d70c26c9ba6a7f030ea5467d9aab7ce7e4efd8a2c5bac643c354ef7a5eb02195a12f06d7615963a5fb83497437aee9ad72621ededb436cbd6a51d6a4 WHIRLPOOL f95e4c39142cb1874680aeca938e9267aa365ba593bb6f9cf654ff5769def16ca28574a35013d731e760968b20d69e635f0b5b490f95ba6f8809b834efb96780
+DIST gsettings-desktop-schemas-3.12.0.tar.xz 479084 SHA256 a623888a47999599abca9728156459b93634e93ac7243a86cf1fc8c2d75f478d SHA512 7e1f24c0294ddb94e7a588567d1ecdbd3b0eaf8bb616d95ccf6ec75d0fad50cc84e9d839df5c6d183d4b5d176e1546d96e1b6e6d1f812427d72f11575a7ca29d WHIRLPOOL 70f7d8dd94981829f944b4d2933ca19f0323d746b824512505ac2f2d2101e583171e025dec2824d380183c5295cf434cd14ac7f8eef8ea1950462cde64a368ab
 DIST gsettings-desktop-schemas-3.6.1.tar.xz 384248 SHA256 d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 SHA512 dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4 WHIRLPOOL 87b756c86fd03ca665ec79819a92d7426190feb8ab07304ca7b7895e2de7fc98ed410bcfa494c18b0b162bd11cafa3929a83d71034dcae6025be1c84c8280788
 EBUILD gsettings-desktop-schemas-3.10.1.ebuild 974 SHA256 3f2ee3714195e223a605d7d9070405d5d00e9ef21d20f20a933861cb29b0e62c SHA512 2d452f9073cb019802801252ecd06cdfb6f00074aba2f3d78579e76159888f96cf871c0bf81623935c3a0822fab64a3e21dfe7815ac8aaa25bbbe44f4a6a863f WHIRLPOOL 334227ed5af48464dd58ffadf2f1706a843c554efafd6f66ca2d92657f95ad63e7b43e8080fecf2b38454195d66f202fd326a34d4647c1fe5b832817d2ede5ad
+EBUILD gsettings-desktop-schemas-3.12.0.ebuild 977 SHA256 8a7c11b247fbb6ee3fb74f742223ced8dd14655fe336820b5b9afe2a7377ff09 SHA512 ba14037805afe20065caa1df8ee84ea6ceedb9b542beef81179b2a544bd87a26131ae4ba58c274e0d7ee928cfdf317bbc4601f5f710c777039a05191eafb81ca WHIRLPOOL 9a3d994efc0212564c548e7ac5e7860444ddc2d042a9e6786b735f4aeadf0edc9c13611f65f5fd4ee45025a169e23fd990b1df9459b5d9f81b28642ff250c1f3
 EBUILD gsettings-desktop-schemas-3.6.1.ebuild 930 SHA256 347d4ce7a5a42096b3f742fe4e56676a7f486d3df807a2572396b9ba143afc67 SHA512 c49d7681aaadeb5618d29d4747e21e2cdcd782478cd907ba570fb1ab5a2858e78f16c43d50e644338ee938a7261d8ad6e31af69fae362c7042934c7657fd21c6 WHIRLPOOL 040b8f508c64bd50a8f3a762777ac6ac4fd1605a753beb99311c33c612ff1da4b6ce342cb4345fda5859f25d93718775fe36f1132083d1dda0f259ac3eb62435
-MISC ChangeLog 10589 SHA256 87124f60f76b87ca992b476a3c2ba2814aa1cd702c191a18621f9bb25eca80e7 SHA512 34b42a0b6f97264c226f5814e1184a17d8617391e4370b677ace7e3bf787791b0ea8da3b4ee899ed212f625dc416808c7e0138451de162ba4ed5d9077315ba05 WHIRLPOOL 4c7eae89d75611e7460cc8b1bae31c401f0fcc8894ffdc8da16bf04d63392d0e5f89905032ed5e173e3a8b94848399e638a625f3abd696a22edef2d0721ac730
+MISC ChangeLog 10766 SHA256 d627dac8401d5100676fe650f9b9c72d5923b2ebed7929762ee58016ff4d4185 SHA512 b05baae757ded6c3f1407beb4ec5c779409062096a42b8c5d6d82bea3ca721cc54594b01d8e2cc59737c68e98f2c6a8603a05d14c47b914de1c8041f48488b4a WHIRLPOOL f837f56a740690644f978d9b9623caef05841bd34c902653051bbbaf40e32fa79746a80abef470b62c56981f1ebb869284a431e98a4765d21725bfb3ca29d6e9
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb+mMACgkQCaWpQKGI+9TTuACfS1JQRO9usBlOO6hW5fF4W3us
-SlAAniZXnBn++DuoJRmYuVgtLDk7fYjb
-=IHSc
+iEYEAREIAAYFAlNdN4wACgkQ1fmVwcYIWAbx8ACg03qt/usbbMFoL17MGXCnhPTl
+JFsAoJNtddnB3zor/AHRTEx01QjSWfTO
+=i0+/
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.0.ebuild
new file mode 100644
index 000000000000..21053fb2859f
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.0.ebuild,v 1.1 2014/04/27 16:59:55 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
+	!<gnome-base/gdm-3.8
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS HACKING NEWS README"
+	gnome2_src_configure $(use_enable introspection)
+}
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 9240cd90f43c..17678cd7b232 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.248 2014/04/26 18:42:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.249 2014/04/27 17:02:41 eva Exp $
+
+*gvfs-1.20.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.20.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.12.
 
 *gvfs-1.18.3-r1 (26 Apr 2014)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 297debca7182..622b6b03a64d 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -9,14 +9,16 @@ AUX gvfs-1.16.3-emit-signal.patch 3313 SHA256 d6a4219e84378ec98980148f2282da6312
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519 SHA512 2f1c8fb6d3fe1171991b2d56fceb7f36ed52e17b29b003eaee09a7550981466de4c7da1b85b16ff71cc710fa0bf90dddd25d0cb91ffc095e67764e75fe09b347 WHIRLPOOL 8b44d6106752108b8db2c548508ead6c951a2baba2725c513e66d95bf2f34a257ee1a9764726575fc50e0f24e536548d5425b93559546261edf9ef0d359e75ec
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 SHA512 e3dbcfc257a5ce2ecebc2011317717d853f8069fbdca1c4bb81e90c79acbe3661f64c68321a1d209fdb3584e09efaf3c655d10b8a586f4a9be3d51d62ada9662 WHIRLPOOL 6c417af80339cee72de22c6ddf055057eefabc059c944a848283566ec20ef4785025b72d79537002254bd4a4675d68d892f7aea435b992245d5b22db689ebb97
 DIST gvfs-1.18.3.tar.xz 1537320 SHA256 1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c SHA512 1589c327de12c5186f1bc5ff48d9404062e2fcdbba266be44b4a71a52341cbd7de51aeecd41540d7ed73c2a21d789ce0d7ba83afa64a42b39753a66a3f81f911 WHIRLPOOL 7d35913ab3fea9dc1341b5e2f9dab3ed33f768e9f24e6ce78fbdad10ddafaae99531257941b445fd1540efb96f47cebd613a00baff18b5baa01509eaab3c5fa9
+DIST gvfs-1.20.1.tar.xz 1558868 SHA256 73f6b104cf93d376f2c8f164ea727dd813f14ca0aa9f5a3a9d8d3a19e34a5b0a SHA512 d6c266ccff098d6f00af2f14980e26513b1ce98864d7345c502c69619bc3683eca67c8463fb77ec5480801fdf43f4c09786e8c17dbf8a37d4059f4094e8dbc90 WHIRLPOOL e18f54105b685863334eef821c6fe4554e049060de81b87c4d0a014bca9db92fe423ad4ac46bcf9facb4cfc5976ba620f535f639977d1048286043d9e489a78a
 EBUILD gvfs-1.18.3-r1.ebuild 3573 SHA256 db92a441764a22a33d8a712fc663c695fe19b31401288f5615e09f040f65b1a4 SHA512 b8cfdefaf417e958f7e2f981b9ac289763189f14ca24de62a6adf881af3131d5e06bbb9bff0d9079aa83729db27a961f84f091ec01dd61343a9b119756a70e3d WHIRLPOOL 89731060f379110194086d4a3c03bd51e926a621fa949a9794c2223ff98e3600f4e3f8955c278b5d76112fdb0a40b72be36e4f6e7e7ace946b9deba9c1e3a717
 EBUILD gvfs-1.18.3.ebuild 3698 SHA256 82e611e5e807cad12f8ac1dc8cfb17373378ab12e0318d8ec2c743434a49c7f2 SHA512 662704ca0c7a7a80605f07e6536aa7916d41dba614f79462870d6d4716a39be7e01f848ef36ad7f200d597cc6273667892c3a6bfdc132f5113692106700fbde0 WHIRLPOOL 3f7be7a67b581663fa49928d8e34fb776cf6b30ef72e96531f30c7588f7bb81717787fad48d96c2875e2365a24e42a46b9ec27e3c4d7288d74017f7dd3aeb4d8
-MISC ChangeLog 35203 SHA256 e87e4caa0020a4ef4ac7396856dbf29dab23883b0761d6f8dbe2d2126a768322 SHA512 6addaa9ff875be44239cb110c901987d6f65140f86588dda23cdbf3139e69b6372e66c91447123097a3b3f6ba7da2e2201110ee03b1c019bf1afb4b8a6aaa7f5 WHIRLPOOL d7e16fbacb15bf1abe15dac3f7f998ef9c2b337171936f7d83cfeced58fd133296e735329c59f9bb1a8c810ed5e7ed219e78575bbeddad05c38cfaf0d2fccbe9
-MISC metadata.xml 1547 SHA256 5f05c22a706de39194219216cb6bbfe608656517126829067ebc3ff37fb2b4e5 SHA512 6e880b69df0c6a245645bcf00ba56d635a40deaecbe510c074982e976c942285e32abe334675333f375020eae8cc82134a72c7ba93afc8e03117c4975478def3 WHIRLPOOL 70c0ac42a95015c9d69fe39655a0110a7f396c3d407f867ab41bc0eb3520f5b906683b9cfb0e0ddb978dda7a330ba20c2ded504700aeb98b04511cd7a4622cee
+EBUILD gvfs-1.20.1.ebuild 3561 SHA256 1b2e9b16dfc826658fa37b83c3824dd629c5d487aa42c2f2644647d3407e6ee6 SHA512 735bafd9d2ba7211dd2b77b2a14822a029a799193a8098f34f91f633e7f51202aee921c6c88aa595e935b54998a056912faf61e37a47b768a358478d5ac3cce2 WHIRLPOOL e77810ce651d9734409b82f6d9f82a8e0ccf989719330aa1df84f4dde9c94f9cee8df8cba70485d657e12f41b6bff79af149120da7e26a31653af2927cc30d05
+MISC ChangeLog 35352 SHA256 1c07ccf7df5dee3c12602f110fb7ec719b94345846c886e37d56bdc562329743 SHA512 0317e379b8274fc13574ee63ea34702ad58db5ca51759b3c2999d333ba6ccf9caf828dc62a73690b83a8236eac64be0d874cb9f0f42d36f212702df4faaa80ff WHIRLPOOL 5c766a53d5a2e2c9b4216ab41723ff5b4f11d34b1c6b74e0a65d762f354d10af6db3a56b9f26feb1e5fad834e86fb7e04f736f9799b25b4b91352370884bf605
+MISC metadata.xml 1538 SHA256 5ee502f100b1b235e5b1855e695d4677d8e946b3102ff753a8a64f35db9c9b14 SHA512 a87f0c091e53558ce3c069bd4c69f692c73885e9c932b05d364a149b8f44139ad3b219f130b6e390c329b5a5d66ed91f8dae490c97a9e87a69db36cb0dd430a4 WHIRLPOOL 4bd19295510f5afd7dcb549e58a9a2a2f0bb9a6b0ebe2eebe255ea8027c0b4d6b59e36f47c913c2a99fa178c3268349126adb0e81829c62b70e999c92f649934
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb/fwACgkQCaWpQKGI+9TktwCdF8NFBn130/Zi96GKsdC/OhTw
-9TcAn16pOE8gv+XbmEB76y4u7le8ryCh
-=uF1C
+iEYEAREIAAYFAlNdODIACgkQ1fmVwcYIWAYh3QCeLlx8TlEvDbpCekuxmTRfzxz3
+We8AmwUmFq7FhEtk8SLalUGqyC7lArrG
+=7GTx
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.20.1.ebuild b/gnome-base/gvfs/gvfs-1.20.1.ebuild
new file mode 100644
index 000000000000..438dccb288fe
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.20.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.20.1.ebuild,v 1.1 2014/04/27 17:02:41 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive avahi bluetooth bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
+REQUIRED_USE="
+	cdda? ( udev )
+	udisks? ( udev )
+	systemd? ( udisks )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+	>=dev-libs/glib-2.37:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	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 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.5:=
+		>=app-pda/libplist-1:= )
+	libsecret? ( app-crypt/libsecret )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+	systemd? ( sys-apps/systemd:0= )
+	udev? (
+		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+		virtual/udev[gudev] )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	gnome2_src_configure \
+		--disable-bash-completion \
+		--disable-gdu \
+		--disable-hal \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--enable-documentation \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable avahi) \
+		$(use_enable bluetooth obexftp) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable udev) \
+		$(use_enable udev gudev) \
+		$(use_enable http) \
+		$(use_enable libsecret keyring) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udisks udisks2)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+	gnome2_src_install
+	dobashcomp programs/completion/gvfs
+}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 3a6970fdbee8..bbad585bf65e 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -10,20 +10,15 @@ using the APIs of libgio. There is also fuse support that allows
 applications not using gio to access the gvfs filesystems.
 </longdescription>
 <use>
-	<flag name='afp'>Enables support for accessing AFP (Apple Filing Protocol)
-		network shares</flag>
-	<flag name='archive'>Enables support for accessing files in archives
-		transparently via <pkg>app-arch/libarchive</pkg></flag>
+	<flag name='afp'>Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
+	<flag name='archive'>Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
-	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
-		application access</flag>
+	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
 	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
-	<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support
-		to store login credentials.</flag>
+	<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 	<flag name="udisks">Enable volume monitoring using <pkg>sys-fs/udisks</pkg></flag>
 </use>
 </pkgmetadata>
-
diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index f5f0ac3f5493..f00f46ee60f8 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.55 2014/04/26 18:43:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.56 2014/04/27 17:03:29 eva Exp $
+
+*libgnome-keyring-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgnome-keyring-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libgnome-keyring-3.8.0.ebuild:
   drop old
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index a3f11e6d7abe..9bc2a6e27039 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -6,14 +6,16 @@ AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
 DIST libgnome-keyring-3.10.1.tar.xz 428336 SHA256 052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772 SHA512 447f24792cf75c746e72f7e714e815f289820ae47f37458e8276eee148529d42f7a2f0a759ca466736e9f6ec46d998c3f7a735aa856db9bbfdf602e369138d7e WHIRLPOOL 7521fb48f5a3e7a5ef1e7421ec082ec864a0314d09783137dad14b36ad42f48dab52e90632d030028e5a80e802ce1d489b8242c1e71e7577876305431890acc8
+DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
 EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
 EBUILD libgnome-keyring-3.10.1.ebuild 1484 SHA256 89e7d9626e03e751722523953cf7c52fc0f8c298db20b222730198a791a5e3fd SHA512 4ed4a48148f46ce7bb4eb76f6e6f7666aff6ae8a7c6b00489f95f4f880fde47927e7c759afcb5336bc29d486e34a5b63c1606f7efd750de44e05258c3e0aa1cf WHIRLPOOL bcb51b4e4e74f3ebe3cd95b24a3c29a1f932ac9628b97c8cd891cd085fef2ace9cb17bbdad62cb592f12a83b32733157738b4d1765a8322f6b0a4967fed1ecac
-MISC ChangeLog 8657 SHA256 3e1401556d6f48a8754b89ac4a3e963c3c037b31811efb9c8f7ef54c521ce781 SHA512 9e3ee344d6dab6f77b7daa8b2a7b95e55ddfd4bc3d92d4d3675a3ded571c7193169ca9cad1b9ee2298af8c0388e9e8d7afd4fe792be0d808137598eb5b60724e WHIRLPOOL dcc8d825c59249ba19d0289bd3e8f58164cc3e157787eb5dae6f2620330c955731bfa533eedea621c5c1ce9ada1e47f5d6659b760059488128ee2372b117f6c0
+EBUILD libgnome-keyring-3.12.0.ebuild 1491 SHA256 d12762b2128dbfe371f3fe6668746def238b96ad05676842d12d2f1fa86cee40 SHA512 c512132ab91fc2565a868dd2d21add17e29884721b028fe242b15e4c28c93dbd1d45ea59f4db126ece5fbc676db3f8f1af0fbf1266f46a02d0a45cbbe942df7a WHIRLPOOL d3063b16b228ee6481054e27ac769c6ff6e7b19e20dc4d7811e051a215b2968573613d97accb28e10ff97e6f2bcf5ce34cc16c538c96eda53ab04e629724aa21
+MISC ChangeLog 8816 SHA256 35bf3fe02da9ccd16fab500981c65c168c6e64c15b59473b679e072d552f9d41 SHA512 107f30366d49c4cb762b6ba1856a910c410ebf19bf7fa96b848cad53e1a54858e25a550a7b6e8c909e6bac9a51ff78b2c5311bce45f29f49da0bde7b6acabff4 WHIRLPOOL 4f99d77d50b21c4811c52a153ce7615fe70e7a92ac33ffab118da4478b3378c463d759722f15fad97480dc4368edd675f9079ae5facd0178083b1f5ed93c93e1
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb/jUACgkQCaWpQKGI+9Qa7QCcCIrJr24ChAKBuwd+9Q4DD/wO
-ed0An2L1GTjFDb10JPUuSGQ6xxsPLbWf
-=6rcZ
+iEYEAREIAAYFAlNdOGMACgkQ1fmVwcYIWAb+OACg14X3hs3DjBmrmt/+0igVHTxB
+fk0AoNPdIfp8RqtsNpdcCe2jtBACOulW
+=gy62
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
new file mode 100644
index 000000000000..22acbf7ebe8e
--- /dev/null
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild,v 1.1 2014/04/27 17:03:29 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 python-any-r1 vala
+
+DESCRIPTION="Compatibility library for accessing secrets"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
+SLOT="0"
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
+
+RDEPEND="
+	>=sys-apps/dbus-1
+	>=gnome-base/gnome-keyring-3.1.92
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# FIXME: Remove silly CFLAGS, report upstream
+	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
+		-i configure.ac configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable vala)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch emake check || die "tests failed"
+}
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index c75f6bc19939..a2e889b81473 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.418 2014/04/26 18:46:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.419 2014/04/27 17:04:07 eva Exp $
+
+*nautilus-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +nautilus-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -nautilus-3.8.2.ebuild:
   drop old
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 6e179838fc9b..8bedb7533b75 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,14 +6,16 @@ AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf9
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b
 DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
 DIST nautilus-3.10.1.tar.xz 3334432 SHA256 f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727 SHA512 a201d661104025b4b5ef4d0aa8ba7d083bb60e164c948e9932a78967f4046cc6e3afe7dcd5d20cfb99f500c4561555022cce4c39f2acc72370a515141798e90c WHIRLPOOL f9ab9305ea528233f1e318b2b96323d4568ac2c7880921a4700b01fc7510bd447bcfb90091655dd02f850cf508211d8abbaea5321c16ea62d2876175726900f8
+DIST nautilus-3.12.0.tar.xz 3350956 SHA256 c19af20ab1fadf04bebee7ec8d3375c5efbe27bb6e0b7d3a60369523baf5e4df SHA512 e42eef48564c8b1fd0cb1cadee285be0c8b1e0840527498f4e4e2d25719d31d3dc1c780cd09e521f187ed98502e0b223aaac589ca22bdc6a4e3bd4c3495feb7d WHIRLPOOL a6a41a4134874efc5b36f992f00b6d0aca14659ad6747dd0ce760ee20458982094b3cf525d83c6df8376a93b3d4ef8667d2f03abb2f9f91097312804a024724a
 EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
 EBUILD nautilus-3.10.1.ebuild 3473 SHA256 0c4b3d63c50ace22a686b81f4481c7d676839abf20825a442abdcf48d2631a8c SHA512 ea6dc7f54f9dff3ead3830f3849f6fa341b3f0e21ee0622bdd510416964a50f9c52cc1326ba0975880fcd34ca25b50988435e248b96d837f8790110f52888997 WHIRLPOOL 9a19f32a13faa3e6654baa428a9f5996fa3216fc1810d52448c99f25d3065af444e3b7fc6819bc30436c5876ffc8f9ec83c51d88a7e77539748418bc879ff5e8
-MISC ChangeLog 63176 SHA256 3bdd42fe112c2ed0cd52a06818ab44aecd109c4580141c3ac3033a687d096b3c SHA512 f2d6b9af94c3a26b6a77a91431d05d62ea6f29f157a0d4e3a96c9a20c2e91a50ca719abd5ec34b35e2fc1e9483c607e8916e1b2c0339186c2e6321c3c8187999 WHIRLPOOL 0425fe21129f2ff283d71c8ecb86cfb99bf98a42b474a25aed399ff6b9f1c5e371db44e1df14b51b8b7d8e8bf976e51a398e046c9244c45b49c63e7ee7b7c4da
+EBUILD nautilus-3.12.0.ebuild 3473 SHA256 89b9ae104a845ac710f77b2409b3f9c8df081a7cdc42b814c7000d7b29a0f9c4 SHA512 aab1d5ff89964e8294ffa84f071414da48ae1ce58c46b704e3612385cbd8a0c389e8500da762463e014f494fe0176b094faffe3ef390e194025e0d1864d77cbc WHIRLPOOL 1fc2c02ea9933cb4a2e9748875d1eada517e9ddc5bf3c2e4c610aafe6aa27291f44601f32273766c5c295a58c769dc9f5b36e56badce1c1627e3518cc0efeb6e
+MISC ChangeLog 63317 SHA256 e7c5fe378eadf589f123551015d42532f03ec27a55775de549192f5b3b0aca3d SHA512 112b47a15599955cfa5b41600fe721a905a6bc593ac3439c9a7cef4257df81879c760305dd32c822a2d404b9d5dade870f2d0086cda0918197a91037cc31204f WHIRLPOOL abd5bc6350485bbce0bc0fe74e1b51a5d2b9fcdff9a81d061b93abd87c016b7f859ac2a170e3e1157b3f2a5cef504d54573f9f673714966af5adbeabcfd6e3f9
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNb/wkACgkQCaWpQKGI+9Tw8QCcDDsfjLnnivFOLsIQdR71nrTA
-yHMAnjVDNLqbmVJvGh03NjEk3DgtSH6E
-=gesu
+iEYEAREIAAYFAlNdOIgACgkQ1fmVwcYIWAbY4gCgmJ7HZt8rLS91yvTdmfXaivtp
+OdIAn3YlK3djAuEcLm4ESF4uAgtAVEBa
+=tGeP
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-3.12.0.ebuild b/gnome-base/nautilus/nautilus-3.12.0.ebuild
new file mode 100644
index 000000000000..f0d782410c93
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.12.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.12.0.ebuild,v 1.1 2014/04/27 17:04:07 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
+
+inherit eutils gnome2 readme.gentoo virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Nautilus"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+
+# profiling?
+IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+RESTRICT="test"
+
+# FIXME: selinux support is automagic
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.3:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.11.6:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3:3=
+
+	gnome-base/dconf
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.33
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="
+	gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]
+"
+# Need gvfs[gtk] for recent:/// support
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# bug #393663
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
+
+	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
+	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
+		-i configure || die "sed failed"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable debug) \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}