Provide a defaults.list and handle XDG_DATA_DIRS properly. Thanks to Nirbheek for his help.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

5 files changed, 430 insertions, 8 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 409270083e52..5bf816b668b5 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.285 2011/03/27 11:25:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.286 2011/03/27 12:37:51 pacho Exp $
+
+*gnome-session-2.32.1-r1 (27 Mar 2011)
+
+  27 Mar 2011; Pacho Ramos <pacho@gentoo.org> +files/15-xdg-data-gnome,
+  +gnome-session-2.32.1-r1.ebuild, +files/defaults.list, files/Gnome:
+  Provide a defaults.list and handle XDG_DATA_DIRS properly. Thanks to Nirbheek
+  for his help.
 
   27 Mar 2011; Pacho Ramos <pacho@gentoo.org> files/Gnome:
   Append /usr/share/gnome to XDG_DATA_DIRS for being able to use defaults.list
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome
new file mode 100644
index 000000000000..e62f3e1c6baa
--- /dev/null
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+	if [ -z "$XDG_DATA_DIRS" ]; then
+		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+	else
+		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
index 4577caf4daf7..d068daea6bd1 100644
--- a/gnome-base/gnome-session/files/Gnome
+++ b/gnome-base/gnome-session/files/Gnome
@@ -9,13 +9,6 @@ if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
 	export XDG_MENU_PREFIX=gnome-
 fi
 
-if [ -z "$XDG_DATA_DIRS" ]; then
-	XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
-else
-	XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
-fi
-export XDG_DATA_DIRS
-
 for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
 do
 	if ( cp /dev/null "$errfile" 2> /dev/null )
diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list
new file mode 100644
index 000000000000..1fee954d5fce
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list
@@ -0,0 +1,333 @@
+[Default Applications]
+application/rtf=abiword.desktop
+application/x-abiword=abiword.desktop
+text/abiword=abiword.desktop
+text/richtext=abiword.desktop
+text/rtf=abiword.desktop
+text/x-abiword=abiword.desktop
+text/x-xml-abiword=abiword.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
+application/x-dia-diagram=dia.desktop
+image/bmp=eog.desktop
+image/gif=eog.desktop
+image/jpeg=eog.desktop
+image/jpg=eog.desktop
+image/pjpeg=eog.desktop
+image/png=eog.desktop
+image/svg+xml=eog.desktop
+image/svg+xml-compressed=eog.desktop
+image/x-bmp=eog.desktop
+image/x-gray=eog.desktop
+image/x-icb=eog.desktop
+image/x-ico=eog.desktop
+image/x-pcx=eog.desktop
+image/x-png=eog.desktop
+image/x-portable-anymap=eog.desktop
+image/x-portable-bitmap=eog.desktop
+image/x-portable-graymap=eog.desktop
+image/x-portable-pixmap=eog.desktop
+image/x-xbitmap=eog.desktop
+image/x-xpixmap=eog.desktop
+image/vnd.wap.wbmp=eog.desktop
+image/g3fax=gimp.desktop
+image/x-compressed-xcf=gimp.desktop
+image/x-fits=gimp.desktop
+image/x-icon=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-sgi=gimp.desktop
+image/x-sun-raster=gimp.desktop
+image/x-tga=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-xwindowdump=gimp.desktop
+application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+application/pdf=evince.desktop
+application/x-bzpdf=evince.desktop
+application/x-gzpdf=evince.desktop
+application/postscript=evince.desktop
+application/x-bzpostscript=evince.desktop
+application/x-gzpostscript=evince.desktop
+image/x-eps=evince.desktop
+image/x-bzeps=evince.desktop
+image/x-gzeps=evince.desktop
+application/x-dvi=evince.desktop
+application/x-bzdvi=evince.desktop
+application/x-gzdvi=evince.desktop
+image/vnd.djvu=evince.desktop
+image/tiff=evince.desktop
+application/x-cbr=evince.desktop
+application/x-cbz=evince.desktop
+application/x-cb7=evince.desktop
+application/x-7z-compressed=file-roller.desktop
+application/x-7z-compressed-tar=file-roller.desktop
+application/x-ace=file-roller.desktop
+application/x-alz=file-roller.desktop
+application/x-ar=file-roller.desktop
+application/x-arj=file-roller.desktop
+application/x-bzip=file-roller.desktop
+application/x-bzip-compressed-tar=file-roller.desktop
+application/x-bzip1=file-roller.desktop
+application/x-bzip1-compressed-tar=file-roller.desktop
+application/x-cabinet=file-roller.desktop
+application/x-cd-image=file-roller.desktop
+application/x-compress=file-roller.desktop
+application/x-compressed-tar=file-roller.desktop
+application/x-cpio=file-roller.desktop
+application/x-deb=file-roller.desktop
+application/x-ear=file-roller.desktop
+application/x-gtar=file-roller.desktop
+application/x-gzip=file-roller.desktop
+application/x-java-archive=file-roller.desktop
+application/x-lha=file-roller.desktop
+application/x-lhz=file-roller.desktop
+application/x-lzip=file-roller.desktop
+application/x-lzip-compressed-tar=file-roller.desktop
+application/x-lzma=file-roller.desktop
+application/x-lzma-compressed-tar=file-roller.desktop
+application/x-lzop=file-roller.desktop
+application/x-lzop-compressed-tar=file-roller.desktop
+application/x-rar=file-roller.desktop
+application/x-rar-compressed=file-roller.desktop
+application/x-rpm=file-roller.desktop
+application/x-rzip=file-roller.desktop
+application/x-tar=file-roller.desktop
+application/x-tarz=file-roller.desktop
+application/x-stuffit=file-roller.desktop
+application/x-war=file-roller.desktop
+application/x-xz=file-roller.desktop
+application/x-xz-compressed-tar=file-roller.desktop
+application/x-zip=file-roller.desktop
+application/x-zip-compressed=file-roller.desktop
+application/x-zoo=file-roller.desktop
+application/zip=file-roller.desktop
+multipart/x-zip=file-roller.desktop
+text/plain=gedit.desktop
+text/css=gedit.desktop
+text/javascript=gedit.desktop
+text/mathml=gedit.desktop
+text/x-csrc=gedit.desktop
+text/x-chdr=gedit.desktop
+text/x-dtd=gedit.desktop
+text/x-java=gedit.desktop
+text/x-javascript=gedit.desktop
+text/x-patch=gedit.desktop
+text/x-perl=gedit.destkop
+text/x-php=gedit.destkop
+text/x-python=gedit.destkop
+text/x-sql=gedit.desktop
+text/xml=gedit.desktop
+application/javascript=gedit.destkop
+application/x-cgi=gedit.desktop
+application/x-javascript=gedit.desktop
+application/x-perl=gedit.desktop
+application/x-php=gedit.desktop
+application/x-python=gedit.desktop
+application/xml=gedit.desktop
+application/xml-dtd=gedit.desktop
+application/x-font-ttf=gnome-font-viewer.desktop
+application/x-font-pcf=gnome-font-viewer.desktop
+application/x-font-type1=gnome-font-viewer.desktop
+application/x-font-otf=gnome-font-viewer.desktop
+application/csv=gnumeric.desktop
+application/excel=gnumeric.desktop
+application/msexcel=gnumeric.desktop
+application/tab-separated-values=gnumeric.desktop
+application/vnd.lotus-1-2-3=gnumeric.desktop
+application/vnd.ms-excel=gnumeric.desktop
+application/x-123=gnumeric.desktop
+application/x-applix-spreadsheet=gnumeric.desktop
+application/x-dbase=gnumeric.desktop
+application/x-dbf=gnumeric.desktop
+application/x-dos_ms_excel=gnumeric.desktop
+application/x-excel=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
+application/x-mps=gnumeric.desktop
+application/x-ms-excel=gnumeric.desktop
+application/x-msexcel=gnumeric.desktop
+application/x-oleo=gnumeric.desktop
+application/x-planperfect=gnumeric.desktop
+application/x-quattropro=gnumeric.desktop
+application/x-sc=gnumeric.desktop
+application/x-sylk=gnumeric.desktop
+application/x-xbase=gnumeric.desktop
+application/x-xls=gnumeric.desktop
+application/xls=gnumeric.desktop
+text/comma-separated-values=gnumeric.desktop
+text/csv=gnumeric.desktop
+text/spreadsheet=gnumeric.desktop
+text/tab-separated-values=gnumeric.desktop
+text/x-comma-separated-values=gnumeric.desktop
+text/x-csv=gnumeric.desktop
+zz-application/zz-winassoc-xls=gnumeric.desktop
+x-content/software=nautilus-autorun-software.desktop
+x-directory/gnome-default-handler=nautilus-folder-handler.desktop
+x-directory/normal=nautilus-folder-handler.desktop
+inode/directory=nautilus-folder-handler.desktop
+application/x-gnome-saved-search=nautilus-folder-handler.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-calc.desktop
+application/vnd.stardivision.chart=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=openoffice.org-calc.desktop
+application/vnd.ms-excel.template.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.binary.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.graphics=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
+application/vnd.stardivision.draw=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-impress.desktop
+application/mspowerpoint=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.presentation.macroenabled.12=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.template.macroenabled.12=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.formula=openoffice.org-math.desktop
+application/vnd.sun.xml.math=openoffice.org-math.desktop
+application/vnd.stardivision.math=openoffice.org-math.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.template=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-writer.desktop
+application/msword=openoffice.org-writer.desktop
+application/vnd.ms-word=openoffice.org-writer.desktop
+application/x-doc=openoffice.org-writer.desktop
+application/vnd.wordperfect=openoffice.org-writer.desktop
+application/wordperfect=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=openoffice.org-writer.desktop
+application/vnd.ms-word.document.macroenabled.12=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=openoffice.org-writer.desktop
+application/vnd.ms-word.template.macroenabled.12=openoffice.org-writer.desktop
+x-content/audio-player=rhythmbox.desktop
+x-content/audio-cdda=sound-juicer.desktop
+application/x-shockwave-flash=swfdec-player.desktop
+application/futuresplash=swfdec-player.desktop
+application/mxf=totem.desktop
+application/ogg=totem.desktop
+application/ram=totem.desktop
+application/sdp=totem.desktop
+application/smil=totem.desktop
+application/smil+xml=totem.desktop
+application/vnd.ms-wpl=totem.desktop
+application/vnd.rn-realmedia=totem.desktop
+application/x-extension-m4a=totem.desktop
+application/x-extension-mp4=totem.desktop
+application/x-flac=totem.desktop
+application/x-flash-video=totem.desktop
+application/x-matroska=totem.desktop
+application/x-netshow-channel=totem.desktop
+application/x-ogg=totem.desktop
+application/x-quicktime-media-link=totem.desktop
+application/x-quicktimeplayer=totem.desktop
+application/x-shorten=totem.desktop
+application/x-smil=totem.desktop
+application/xspf+xml=totem.desktop
+audio/3gpp=totem.desktop
+audio/ac3=totem.desktop
+audio/AMR=totem.desktop
+audio/AMR-WB=totem.desktop
+audio/basic=totem.desktop
+audio/midi=totem.desktop
+audio/mp4=totem.desktop
+audio/mpeg=totem.desktop
+audio/mpegurl=totem.desktop
+audio/ogg=totem.desktop
+audio/prs.sid=totem.desktop
+audio/vnd.rn-realaudio=totem.desktop
+audio/x-ape=totem.desktop
+audio/x-flac=totem.desktop
+audio/x-gsm=totem.desktop
+audio/x-it=totem.desktop
+audio/x-m4a=totem.desktop
+audio/x-matroska=totem.desktop
+audio/x-mod=totem.desktop
+audio/x-mp3=totem.desktop
+audio/x-mpeg=totem.desktop
+audio/x-mpegurl=totem.desktop
+audio/x-ms-asf=totem.desktop
+audio/x-ms-asx=totem.desktop
+audio/x-ms-wax=totem.desktop
+audio/x-ms-wma=totem.desktop
+audio/x-musepack=totem.desktop
+audio/x-pn-aiff=totem.desktop
+audio/x-pn-au=totem.desktop
+audio/x-pn-realaudio=totem.desktop
+audio/x-pn-realaudio-plugin=totem.desktop
+audio/x-pn-wav=totem.desktop
+audio/x-pn-windows-acm=totem.desktop
+audio/x-realaudio=totem.desktop
+audio/x-real-audio=totem.desktop
+audio/x-sbc=totem.desktop
+audio/x-scpls=totem.desktop
+audio/x-speex=totem.desktop
+audio/x-tta=totem.desktop
+audio/x-vorbis=totem.desktop
+audio/x-vorbis+ogg=totem.desktop
+audio/x-wav=totem.desktop
+audio/x-wavpack=totem.desktop
+audio/x-xm=totem.desktop
+image/vnd.rn-realpix=totem.desktop
+image/x-pict=totem.desktop
+misc/ultravox=totem.desktop
+text/google-video-pointer=totem.desktop
+text/x-google-video-pointer=totem.desktop
+video/3gpp=totem.desktop
+video/dv=totem.desktop
+video/fli=totem.desktop
+video/flv=totem.desktop
+video/mp2t=totem.desktop
+video/mp4=totem.desktop
+video/mp4v-es=totem.desktop
+video/mpeg=totem.desktop
+video/msvideo=totem.desktop
+video/ogg=totem.desktop
+video/quicktime=totem.desktop
+video/vivo=totem.desktop
+video/vnd.divx=totem.desktop
+video/vnd.rn-realvideo=totem.desktop
+video/vnd.vivo=totem.desktop
+video/webm=totem.desktop
+video/x-anim=totem.desktop
+video/x-avi=totem.desktop
+video/x-flc=totem.desktop
+video/x-fli=totem.desktop
+video/x-flic=totem.desktop
+video/x-flv=totem.desktop
+video/x-m4v=totem.desktop
+video/x-matroska=totem.desktop
+video/x-mpeg=totem.desktop
+video/x-ms-asf=totem.desktop
+video/x-ms-asx=totem.desktop
+video/x-msvideo=totem.desktop
+video/x-ms-wm=totem.desktop
+video/x-ms-wmv=totem.desktop
+video/x-ms-wmx=totem.desktop
+video/x-ms-wvx=totem.desktop
+video/x-nsv=totem.desktop
+video/x-ogm+ogg=totem.desktop
+video/x-theora+ogg=totem.desktop
+video/x-totem-stream=totem.desktop
+x-content/video-dvd=totem.desktop
+x-content/video-vcd=totem.desktop
+x-content/video-svcd=totem.desktop
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;epiphany.desktop
+x-scheme-handler/https=firefox.desktop;epiphany.desktop
+x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..6871fd11b087
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r1.ebuild
@@ -0,0 +1,80 @@
+# 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-2.32.1-r1.ebuild,v 1.1 2011/03/27 12:37:51 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils 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"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.22.0:2
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2:2
+	>=sys-power/upower-0.9.0
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!<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}
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--with-default-wm=gnome-wm
+		--with-gtk=2.0
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Add "session saving" button back, upstream bug #575544
+	epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+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
+}