Old upower needed for 3.10, drop old, 3.12 needs 0.99 as it uses upower instead of gsd for the power status icon for example

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

6 files changed, 17 insertions, 464 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 99712b1f2b8e..ca1f90fa7746 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2014/05/31 22:37:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.81 2014/06/01 08:07:31 pacho Exp $
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org> -gnome-shell-3.10.4-r1.ebuild,
+  -gnome-shell-3.12.1.ebuild, gnome-shell-3.10.4-r2.ebuild,
+  gnome-shell-3.12.2.ebuild:
+  Old upower needed for 3.10, drop old, 3.12 needs 0.99 as it uses upower
+  instead of gsd for the power status icon for example
 
   31 May 2014; Samuli Suominen <ssuominen@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 fe7d18aac769..35c688825b54 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -13,22 +13,15 @@ AUX gnome-shell-3.10.4-wired-network.patch 5804 SHA256 14f61ee92b4f01bc39454e121
 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
 DIST gnome-shell-3.12.2.tar.xz 1540872 SHA256 3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71 SHA512 21c6d121d04f631a801367a61822b625bfcbcef13dc99be61fa1972f44012cac06e74684447099e5e1e951e20702df5e3c031fb73f315f843bdbfc55fa8c1e0d WHIRLPOOL 8ca32b15dabc617ba8d61d82ed1357300613ae166aa91dfa427435de8cda07a281f0f085fb6dd12512928fabef82a47785f8fe57ea3cc87f2d49d4e85ec190fb
-EBUILD gnome-shell-3.10.4-r1.ebuild 7815 SHA256 cec8b8fe153360f7c25f3266091f5503c3f656c6005e07a168a9ce6af8770ad6 SHA512 6e8593556eef07cd20852683f8395f43d6065a58b28df3f0c8739ccb84321720658cad914990881ae4cd527963cd98ae00cbdb14e7bdd06d264381537acada81 WHIRLPOOL 4247a6a81c58a7a074a90b39f20071c99f9cedb5571d42dd26b79fe3f141e8eecd346eb40f7df87f9a3326a28bca42489dc025264ba5a91def4a44065d9dee97
-EBUILD gnome-shell-3.10.4-r2.ebuild 8391 SHA256 e7af0e9f6489eb8809e474842700a9619efc9bf5a468b8253fc86a2deffc4399 SHA512 d8169675b4df04c2f5fd7b9ccb72deb852338a18aa0812f91b5db57d12b85aa694263d6a1769f201927c3c0000b55c35df242719ca07036e8b621cbe0f4ff29d WHIRLPOOL b51c1575644d9a69b4c27ec3a7174f81b839de6f8b352a9c8022d1da637e5f8795cebfe215aeee62543014acaffc0aceeaa186de4c810a04a409c23b1bf5bb00
-EBUILD gnome-shell-3.12.1.ebuild 7548 SHA256 18b033e15fd4b60992ef8e2137889f1e3ed22236ad9f7d79948ba1d19bb2c8d7 SHA512 9b066c1dcd3b7d5d1d844328ebe928c8c686e5fe6bb3e6c7a46d037a22925a19907b818ff87e7664ca2d68c82b2b35d5717a1eccd9c6bbf10645dc64334ba438 WHIRLPOOL 95741f6f28695ceedac960eeeb029ba935928845502acd78b9becdbab545f7b1cb6a38adce0e68f9b103cce27e94993b4f79e84eefde20b1f55513e2d1d3f062
-EBUILD gnome-shell-3.12.2.ebuild 7544 SHA256 e7120146fd667262b5863283fbcbae65351de59ba7629ffc60c5dd2669bfde96 SHA512 fc4e6c4c83c1e8754cdf8ee9d30a4f61ed97ebe6c9a4548a3fc68bb9e698ad86d7b5a6ebf96a51c6edb5a368be670b88df5efa12476359d022528c282fae74a6 WHIRLPOOL 0407320a01707c5f06951d5e332871a2632e9233457937ee11eead302d8aed1d1b8649ada41a44e6cb4424b262cbdeccf9efb40a9783037bc115bf949c46a9ef
-MISC ChangeLog 17552 SHA256 891bf0f2b32f77f85ece258c825acca3695d61b637d71565255c4d0e094b89e5 SHA512 c2d46a4e7e1a9fcd30ffad73ddc15006a20fcdb327f2bc989c4c2fe1a73fb8b24bd8198e1583de512c0b7fa9e56d5f5d4cec78267ecbec58f21a2cf4cc3d81b0 WHIRLPOOL 6ab676f578c9cf6f8679f4f4d7dd4f7871e191aa7846ca3dd9b93c06407bf80dd3ed515e0bfa9c2fdf9b7a91114a55b9f9d5f15a16d5c320adffc9623d390c2a
+EBUILD gnome-shell-3.10.4-r2.ebuild 8393 SHA256 efbb21761cca53ab3d6e3d25c502006617b0cacfeac65cc3524b4ff92ec93355 SHA512 47d8b562a3a5a2f22ef8aeb8bf2adf6f06a6db1fe26206e0ab94b0406aa64645f28e92d3ec2da4682ad92af64aa9d78405369e3a4aa4610b3fc853558e803440 WHIRLPOOL 60415dadcb1192c72cd6c171e367129678658d2079a622f7f2e9d33af5cff5ae63d71f1f8c16eb03bfc7efcb106e8a63704c8b6574d4d221967295862d976a9e
+EBUILD gnome-shell-3.12.2.ebuild 7551 SHA256 eb5bd02d7b8effeeb3afe5eef11f661d573b6a1cce7a9391bd0e794b3085db94 SHA512 39b47f27c3fc5875a367f7ca03d8a9ef0023898982a4da88f515e720ef1dfe00b9976f2de8ded6ba3a1e661ed56b691f123962175b577bcbc6c69de7d5a0780a WHIRLPOOL b5d595c75f7891caabcdfd1577214ea3fb663b9b7b0db2858801223df1ab161f2337788b59bfe07198855a1f7bbf3a45940227d0a927ab2fac69f94e81abe640
+MISC ChangeLog 17844 SHA256 e76052df3702b0d02524d603d03a9bca18ae03d4f2f6996a25ac8eb6443e8437 SHA512 e828f4489604f652a96e54378cee130a70d3d97717ec372c9051d3b420766d1597dd89ef1ebceb9081beb74ac63aaebff88758e88b70d8c7b04c53aab15e397c WHIRLPOOL d9fd41bd1b1956b93809523a5388701089d76ac59ac4a4a8401e33ae17d95ee05facb31c51e31ae882a73038c06be985c690f5d68d31f6f272ce3fffad790f96
 MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTilkgAAoJEEdUh39IaPFNDfgH/3VGHNXsYiD3edVsNUoNyGIR
-/cRGqr8jJyyWv0MJS7sNZEcpMymQtFQ1GoK1C9uQwtWsByipdSBaLBXlA39LTD7z
-aV7SislQWYniLalCgNzZLLO4AhinQzb1UrZFSCG/ZZMmES0MPctjmTsSK4wGN8Ak
-emA4Gd/JGSvHrd6eMOxyyef7iFP7FVwoStc4ALFdYPcA5GMgV1LGh+uQnzKIZQTb
-DOUefgh0q+CDK5ieDPJea+bef9uKOp/RITxD4So6qkR+7G+GHCc4+S0P1JW56CoN
-JedVn7tkTnczvRcgq5n/tAMZlfYFNc3pWdoE24KQcEdJ60mkxaKKHCPaZt5aO7I=
-=f6JI
+iEYEAREIAAYFAlOK30QACgkQCaWpQKGI+9SWXQCfepdDw8WNy7Q6bvpTDQvPO68n
+LoEAn1kq/pi/3d4YfTyHp+UwsuvG7qkd
+=74uP
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
deleted file mode 100644
index af91fc4a6def..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# 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.10.4-r1.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_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-crypt/libsecret
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.37:2
-	>=dev-libs/gjs-1.38.1
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.7.9:3[introspection]
-	>=media-libs/clutter-1.13.4: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.7.4
-	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-3.5.3:3[introspection]
-	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.10.4[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? ( >=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
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[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 )
-"
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
-"
-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.10-bluetooth-flag.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.10-networkmanager-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"
-
-	# Fix background glitches with multiple monitors, from 3.11, bug #504530
-	epatch "${FILESDIR}/${PN}-3.10.4-fix-background-manager.patch"
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		$(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/gnome-shell/gnome-shell-3.10.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
index 5665a2eaa6d0..554177cec37e 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.10.4-r2.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.8 2014/06/01 08:07:31 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.4.8
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+	|| ( <sys-power/upower-0.99[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
deleted file mode 100644
index 40d151a7255a..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# 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.3 2014/05/08 01:11:26 tetromino 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
-	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 )
-"
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
-"
-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/gnome-shell/gnome-shell-3.12.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild
index ae7c25701697..045317d927c3 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2014/05/31 07:49:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild,v 1.2 2014/06/01 08:07:31 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.4.8
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
+	>=sys-power/upower-0.99[introspection]
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3