Remove 9999 cruft, depend on dbus[X] for session management

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 25 insertions, 26 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 5a09db2b6308..0ec49255e81a 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.294 2011/08/18 18:21:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.295 2011/08/19 12:07:06 nirbheek Exp $
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-session-3.0.2.ebuild:
+  Remove 9999 cruft, depend on dbus[X] for session management
 
   18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-session-3.0.2.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 40d72ad1f352..b9826b97c99b 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -11,23 +11,23 @@ DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be8
 DIST gnome-session-3.0.2.tar.bz2 805690 RMD160 58268528a627ffe9be96e8d168ea278b98c5e693 SHA1 5559a71ef3134f3aaa48b7f06e2123714f71756f SHA256 4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96
 EBUILD gnome-session-2.32.1-r2.ebuild 2181 RMD160 62ce137f70d6fabe0531cc10c8e5a66b884edafc SHA1 29e676cd69295adca01f209f7ed751a3690d1445 SHA256 1a0b4219a56f9e944d7badbc96769cc474058a7fc521b7a787060c72caf54c4f
 EBUILD gnome-session-2.32.1.ebuild 1818 RMD160 801e7c83e5964ca0fd1f377a2df4f65964c726e4 SHA1 dc5dfce1084b891237b290608d5f81551b139cbf SHA256 65381314484779e4b4391a72f896ab49a35396048f641bab49ea8b99f5aef459
-EBUILD gnome-session-3.0.2.ebuild 3040 RMD160 cd8c9bc9ec4e7c33f5b3c6c35432ab4f8570b37b SHA1 5e576113d9b533c7b1752cd8f36a04f6b4257ee5 SHA256 58b9e8418ec04a3e803e74e5f651da44e4738069fc5a418e56af42bd27497a55
-MISC ChangeLog 42446 RMD160 a088cc4165debfc6ae3904ea3b5f7ac9d1d797aa SHA1 aca8aa6ed9609a183d8dc75757e71082c975d58b SHA256 addef2f4038a69afb5d178efa09f0f2b875f4dbe7d98b94fbe743131ae6201e6
+EBUILD gnome-session-3.0.2.ebuild 3008 RMD160 90605703cc0e6a6e83987714de0e9a53efb93658 SHA1 be7a5ea68af2605fc2cfafc1efd13a7e19294f6d SHA256 3ddabe923a9abd8bddcfef5a807f92532337cca125531f2b686f7aec051323bf
+MISC ChangeLog 42593 RMD160 b76ede6ca8185185b08c6dc6b8223712a4259345 SHA1 9a545d9c14a040406ae04c6cf785f6b2a475a795 SHA256 4fb34b9da5a62bc92f1f4337e044cdf8edf690150b8ef5f032bde0f18f7979ab
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTVgbAAoJEO/kOhxWD91k32IQAJP2KMnz6QlXp6ngVkL5def3
-B1NOMPcCj21WnpfGrmaVrZYg3NLaLI8uIKNNW8uWOEpiGbXRbMmXXZV9vkNpOkvh
-h72qOCGEn2pDACJpmx+p+TYb2N/zofgoDC6diTh2+emS7qvD2gFuvWFBurRJKe7O
-SjRqXN2l30njXGOQ+LoIgnsl54IXRYUJgk1gp71zTUvFDQQMXUN2CakolWmXkKNn
-7rUnI1pg2IwIVKuEtvioq/PGxYgKLrK5rdBt/6yh7VoddnMIZtfTqtYnWjz3Y+oT
-eyCvsbHOYwYK3/vo9W08f1Wv+H3/EOAYXDrWaluhwaWSRwLe8z7V/CzMafBtei0K
-E2H1K2z/32KGcTXXHQUYJ8FA36pqEqfz/WUQwwjrYeTNMfHe7eVDpZVtXsv1cBX/
-HUK3RxCsT7olO+HrczGkBR/P/0A1F55gyHmSy3rapkEDZbAJTu9PYbGz+9BwncZB
-X8Ff21Va2YG+uIH7CjjdcSklGZPiMT/k5dQRrbqciJ31sYeQU6oONi4IanDN0Ydd
-JeRyAfzU3xyY/S1aBg0Fi/fs1TEWArTOY3u/K+aunnCWP3l7jKjUQpKq+fyyP7dq
-2p2rQqOv+DYgFIPrIaH9haLQoc6/vyeq1ZTbhzF1m07uYhhbLVdLSPsEn05kuEL8
-9+TMCIBbJjr0iXE1FibW
-=wxnr
+iQIcBAEBAgAGBQJOTlH4AAoJEO/kOhxWD91koogP/3vknbchat6MvWcpFrBlsWsH
+toup5uJx+JgUGct1VaHSrsclvyb6oyVgjWlR5DtC2fmU44mTa+BYxxG1cORSN8wZ
+pTBU49f6CFz1syrvfynx8bnJdGf+Hvt3Fq3iv4Rzcz0IagnTe6e6SkLtVEFpUXDD
+io4qa8u5GMYgYXOO5vj9277YVfOfG14zJl2NlZGCkhm1hxNM3ktV0U6CQP2e1oG3
+2PaXU8Kr6OAJzkxCol47NGQ9YYzY+gfINV3eC/AkOzPhorywEDHurP41jRHRSdHf
+joJXFoyM7V0JzaHSlEtd8y+e+SarhZFDd5AClhwKseY5u53FAiyc5dZqzE/yrLCT
+FZ82dQ+ogtv5kzJve0uLhgLC0VBld+kcq7h+JRrm0P6RPe0Noish7i5NeoScquHx
+sG8FR8dUazB61+gKNB9eQdqhW3u/T2l1BoK/LsX+V2Dvl6F9OPbvO0StNxPu3C4e
+shmY+MAgdzlR+pa9lILKmOSZ3Y5bMCJuuewzxCo56f/KOlF9MBRdu211niENpeEW
+ZaUVss1sAv9FDlMu1PLHpO/aNTdEVvkSjseZWsGDUvM19DyPya5COQHvPE3ZL3Xm
+Aa0S24bQ2G9h2SufCwH8Pejw5omWQAQe3seY6HiY/q2UwVcx9Vq9h6S3AHDccvgy
+Zgs6EwLj6jFKZgMLJBZD
+=8k9x
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
index e05b7b0d0f3f..a797ed9679fd 100644
--- a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
@@ -1,25 +1,18 @@
 # Copyright 1999-2011 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.0.2.ebuild,v 1.2 2011/08/18 18:21:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.3 2011/08/19 12:07:06 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc ipv6 elibc_FreeBSD"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
@@ -48,10 +41,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 # 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"
+	>=x11-themes/gnome-themes-standard-2.91.92
+	sys-apps/dbus[X]"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40