Bump to 3.0.2, from gnome overlay for GNOME 3

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

5 files changed, 139 insertions, 12 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 134b3ff0bad1..7ae4e5272665 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.292 2011/04/30 17:39:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.293 2011/08/18 05:04:13 nirbheek Exp $
+
+*gnome-session-3.0.2 (18 Aug 2011)
+
+  18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/10-user-dirs-update, +gnome-session-3.0.2.ebuild, files/Gnome:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   30 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-session-2.32.1-r2.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 051f6f8dbc4c..f922b172af71 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,20 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 10-user-dirs-update 215 RMD160 0ec078acddb6ee758cdc9f29f35ef83000024874 SHA1 3fe8f927240426cb772288caf920291fc0ecd571 SHA256 fe1dd00944d2651e80e588b60530531b67da6ed9c01fbf9e3edfa803f9d0f89f
 AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
-AUX Gnome 2404 RMD160 48ab5c98ac1cda3593c99f6996f72a61b63b87c7 SHA1 eb7422e38600214911075bffae52fbb348a1ba44 SHA256 259c067c3293fccb587daba38fae888119250330a624687674e140e31c75d297
+AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3
 AUX defaults.list 14505 RMD160 1e15a5166728493f21987b530fafcae735a47a3c SHA1 927a883d98b7dbbed75f4480c284e0b0431ab000 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354
 AUX gnome-session-2.32.0-session-saving-button.patch 21424 RMD160 11c4db9951859c2749473a7969693469c9d9e277 SHA1 f7c2f8d98c6deac63ca9448977bdcfa29ae80d52 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97
 AUX gnome-session-2.32.1-gnome3-conditions.patch 4552 RMD160 429b39d3338fb26eb96c94d4087579c5620393b3 SHA1 d96cd45515d484c6d82fe135b5b678349850490b SHA256 88482711f19399b766ed562c43511d8a6db1e1df2790945cd1819d7f616af42e
 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
 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
-MISC ChangeLog 42083 RMD160 e40bc947ba41d970dfde19055c1ac271fccec746 SHA1 c8cfd777076c6c2aed980909d1c76b64a0368c7e SHA256 820dcfe80878da30226cf4ede7fac0cb3d1bf335535f9633d172efbe03e1f87e
+EBUILD gnome-session-3.0.2.ebuild 3018 RMD160 cee898b0495d2b1ba274f81f5259680db98485dd SHA1 0316f9d4adc080816caa083c9e17ec0a64c7ecce SHA256 786068f46c5c95bbef338e23c1e91cdc63267822a35ef6f21a97617bec2f4f4e
+MISC ChangeLog 42295 RMD160 a7c7a3ddf0a5a5f8abfcadf9cb01e88200024004 SHA1 e61786a9d1a247342be77bfa4cf9f0f73239bda7 SHA256 7912c570cc86137e16b8b3574293e30cd1a20218c7dc9209bdd174cd6c08ac7b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28SWIACgkQuQc30/atMkC3mQCeM4wNur0zyrkRu0nWz/kpMyf7
-K6AAoJhIpihbgsnJJwEWzgx4pqvPc1La
-=HB/o
+iQIcBAEBAgAGBQJOTJ1UAAoJEO/kOhxWD91k2C0P/j6JRyBXVDASu6cD9T9hnRZj
+/STrEAGcm1ZUu4y+RfzGsA1yQRpEQFdbzvME5hj8y2B885WhSEm8/YFpNhTxYkUZ
+szlXodKb9kNIXGfOPCjE9RFen/5wpenJYGsp/dU8s1LE6mNu8ipW6rUUhUx7j9VH
+IqiQnXQGfDjxmOCaZNrcgLpb2r5aPuYWYJef9fEYou7lD+GtI4xRtqTB+oSV1XK+
+MBYEQBFd+VwiNm3oj4oVWlmwSFLpLjDc6+Wcvl7wH5n4BhRkBh7RyaCEgQQ1+4je
+xD/s3VxAM6Q+I48mJmwqVfr+22/ZjWP+9iqgBOJP3yjhJwIHO9DIcL204bs7Uz/K
+GpH2b0UmuOmjP2WGF09QYkk3DA1UEyx11kFbRORvbneU2drPGDJvq+iYSQ8hahPY
+Imui0QXZbC7/coeGqP8G/gDkbCtw1Q9hQeGbOUvyD8HCX2Inwdl3ffddkx5NrkUd
+m+zTjFtmHGZalVYerutZqtgoo9mDHZ5BTKNJ6SUTNBGdAj5rkEkhRO2tVQqA3djs
+DLE7+vIkVNDu8mj/yATjSNIsMQ6fZ21z0ymmFb+lKfRNVI0YI1/6dZF9hzUmy4iR
+bb0XnjSrFGlNAedLjrWNkRTdJt3suNV08iLaierdgShCNjKWp5A3trgf9wRi7iAH
+sIYW6oBFs3EkfwjVwrfh
+=sooz
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update b/gnome-base/gnome-session/files/10-user-dirs-update
new file mode 100644
index 000000000000..317f095e0bcc
--- /dev/null
+++ b/gnome-base/gnome-session/files/10-user-dirs-update
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+if type xdg-user-dirs-update &>/dev/null; then
+	xdg-user-dirs-update
+fi
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
index d068daea6bd1..55d39b633257 100644
--- a/gnome-base/gnome-session/files/Gnome
+++ b/gnome-base/gnome-session/files/Gnome
@@ -1,9 +1,7 @@
 #!/bin/sh
-
-# Great new Gnome2 feature, AA
-# We enable this by default
-
-export GDK_USE_XFT=1
+#
+# This file has bitrotted badly. Someone needs to clean this up.
+#
 
 if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
 	export XDG_MENU_PREFIX=gnome-
diff --git a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
new file mode 100644
index 000000000000..bed82a16bfab
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
@@ -0,0 +1,103 @@
+# 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.1 2011/08/18 05:04:13 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
+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 below).
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-2.90.7:3
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2:2
+	>=sys-power/upower-0.9.0
+	gnome-base/librsvg:2
+	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
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=x11-themes/gnome-themes-standard-2.91.92"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<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-maintainer-mode
+		--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 || die "dodir failed"
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+	dodir /usr/share/gnome/applications/ || die
+	insinto /usr/share/gnome/applications/
+	doins "${FILESDIR}/defaults.list" || die
+
+	dodir /etc/X11/xinit/xinitrc.d/ || die
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/15-xdg-data-gnome" || die
+
+	# FIXME: this should be done by x11-misc/xdg-user-dirs
+	doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed"
+}
+
+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
+}