Bump to 3.2.1 from the gnome overlay.

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

3 files changed, 117 insertions, 7 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 39edf6e71c90..159e0d454b11 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
 # 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.302 2011/10/28 20:06:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.303 2011/10/29 01:33:47 tetromino Exp $
+
+*gnome-session-3.2.1 (29 Oct 2011)
+
+  29 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-session-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay.
+  Notable changes: lots of stability improvements, XDG_CURRENT_DESKTOP support.
 
   28 Oct 2011; Markus Meier <maekke@gentoo.org> gnome-session-2.32.1-r3.ebuild:
   arm stable, bug #385699
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index ce23be7707da..df6af398929b 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931
 AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
@@ -13,15 +13,17 @@ AUX gnome-session-2.32.1-gsettings-conditions.patch 5085 RMD160 257d3bd04034abad
 AUX gnome-session-2.32.1-idle-transition.patch 1802 RMD160 aec519f8b0bfff589c079d365dbdf134333f4f69 SHA1 67bcb498be8410c3ea3f0bdfc0bc42a880827208 SHA256 6e80574672ff9e4b9a63796959d1e83af0f184eb4ad507bcbe6589c364b63038
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
 DIST gnome-session-3.0.2.tar.bz2 805690 RMD160 58268528a627ffe9be96e8d168ea278b98c5e693 SHA1 5559a71ef3134f3aaa48b7f06e2123714f71756f SHA256 4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96
+DIST gnome-session-3.2.1.tar.xz 700852 RMD160 ce31f04f2ced486f0bca59e7e64cf1194f401eff SHA1 a330cb69c3a1126ed57d36a58004987275e8982a SHA256 a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3
 EBUILD gnome-session-2.32.1-r2.ebuild 2181 RMD160 62ce137f70d6fabe0531cc10c8e5a66b884edafc SHA1 29e676cd69295adca01f209f7ed751a3690d1445 SHA256 1a0b4219a56f9e944d7badbc96769cc474058a7fc521b7a787060c72caf54c4f
 EBUILD gnome-session-2.32.1-r3.ebuild 2891 RMD160 89d04de36d17ac1d9d95b3845fee40cc62d5c5c1 SHA1 eb9744bd183ef9afc5bba3cba6a9bd9570f1684e SHA256 55d0258adea516b5b96cfb57f55cb8e18fdf59a7a305ba85ca105b96431c7534
 EBUILD gnome-session-3.0.2.ebuild 2995 RMD160 589224ec7c509bf17b14a427dddb7da2665550b9 SHA1 1ec7136add9906b033faa45bc52a6e8e6999b6cb SHA256 3d1268edb8276503c5867f18797a8182ad5515efe59cf87c9a8f14a375b22246
-MISC ChangeLog 43994 RMD160 5fac17ed33d8dd44150d74505235dc9aa611218f SHA1 038522d51b389b2f291efb14bde6b4c7e38fe257 SHA256 41e28af40133c90fffa6a033293e2bb4830cf8e7f872ad9e8f016d47e2237860
+EBUILD gnome-session-3.2.1.ebuild 2969 RMD160 b83ae23d83b16d88c0731bb2f5f3b00bafe85634 SHA1 9940a5ba733fdd9de2f052cbd740ef0e1f83f6e4 SHA256 7d2ba41cae5c7fb67788a4c61359ae217b0b4a2835afb92ea6d92997dcb0b498
+MISC ChangeLog 44244 RMD160 4ac3e7953b0ba0ab972bc821e1a926641adc6376 SHA1 054ce2ebbdab9af79ab60e6fae9b0bdd9a61ee98 SHA256 df8af8da9800f950e0edf7098b74e53c17e5dcf1591ea93d104418aeafd0bc6e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6rC44ACgkQkKaRLQcq0GJZugCgiZvCkH3HS1brveqsQoNmuaov
-xvMAn0+mxYMFupRXYMIYhIAQt7CRWfQe
-=WvY7
+iF4EAREIAAYFAk6rWAAACgkQdjK8w9WeBnD8+AEAlmC6vqoXEudDfMafNIu1NW11
+lf+4P17OYD2NPc69PykA/2x1iKybWsksJLv/QZ2G6dPstMHQQyu/yGdU9u4nYdq0
+=hwMu
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-3.2.1.ebuild b/gnome-base/gnome-session/gnome-session-3.2.1.ebuild
new file mode 100644
index 000000000000..c275f911044c
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.2.1.ebuild
@@ -0,0 +1,101 @@
+# 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.2.1.ebuild,v 1.1 2011/10/29 01:33:47 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+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 ipv6 elibc_FreeBSD"
+
+# 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.28.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/gconf-2:2
+	>=sys-power/upower-0.9.0
+	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"
+# 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]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40.6
+	!<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
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		--disable-deprecation-flags
+		--disable-schemas-compile
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+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/
+	doins "${FILESDIR}/defaults.list"
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/15-xdg-data-gnome"
+
+	# This should be done here as discussed in bug #270852
+	doexe "${FILESDIR}/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
+}