Bump to 3.0.2, from gnome overlay for GNOME 3

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 120 insertions, 6 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/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
+}