Version bump for Gnome 3.16. Clean up old revisions.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 23 insertions, 791 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 11b97e63ea46..214862157f1d 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.349 2015/03/22 17:50:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.350 2015/06/09 16:03:56 eva Exp $
+
+*gnome-session-3.16.0 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-session-3.12.1-r1.ebuild, -gnome-session-3.14.0.ebuild,
+  +gnome-session-3.16.0.ebuild, -files/defaults.list-r1,
+  -files/defaults.list-r2:
+  Version bump for Gnome 3.16. Clean up old revisions.
 
 *gnome-session-3.14.0-r2 (22 Mar 2015)
 
diff --git a/gnome-base/gnome-session/files/defaults.list-r1 b/gnome-base/gnome-session/files/defaults.list-r1
deleted file mode 100644
index e3aa8541bb41..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r1
+++ /dev/null
@@ -1,334 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.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;chromium-browser-chromium.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop;nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.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;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/files/defaults.list-r2 b/gnome-base/gnome-session/files/defaults.list-r2
deleted file mode 100644
index 0d98512dbb0b..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r2
+++ /dev/null
@@ -1,334 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.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;chromium-browser-chromium.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.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=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop;nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.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;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild
deleted file mode 100644
index 5f696484f19f..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 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.12.1-r1.ebuild,v 1.3 2014/12/19 13:37:24 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-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 elibc_FreeBSD gconf ipv6 systemd"
-
-# 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.40.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/gnome-desktop-3.9.91:3=
-	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
-
-	gconf? ( >=gnome-base/gconf-2:2 )
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# 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]
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	!<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
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable gconf) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-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/
-	newins "${FILESDIR}/defaults.list-r2" defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 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
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0.ebuild b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
index 1ae5d9ce3777..b5e4a03a9a33 100644
--- a/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.14.0.ebuild,v 1.1 2014/12/22 21:25:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.16.0.ebuild,v 1.1 2015/06/09 16:03:56 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -24,7 +24,6 @@ COMMON_DEPEND="
 	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/gnome-desktop-3.9.91:3=
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
@@ -53,7 +52,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=x11-themes/gnome-themes-standard-2.91.92
 	sys-apps/dbus[X]
-	!systemd? ( sys-auth/consolekit )
+	!systemd? (
+		sys-auth/consolekit
+		>=dev-libs/dbus-glib-0.76
+	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
@@ -80,6 +82,7 @@ src_configure() {
 		$(use_enable gconf) \
 		$(use_enable ipv6) \
 		$(use_enable systemd) \
+		$(use_enable !systemd consolekit) \
 		UPOWER_CFLAGS="" \
 		UPOWER_LIBS=""
 		# gnome-session-selector pre-generated man page is missing
@@ -93,9 +96,8 @@ src_install() {
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/Gnome"
 
-	dodir /usr/share/gnome/applications/
-	insinto /usr/share/gnome/applications/
-	newins "${FILESDIR}/defaults.list-r2" defaults.list
+	insinto /usr/share/applications
+	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
@@ -103,6 +105,11 @@ src_install() {
 
 	# This should be done here as discussed in bug #270852
 	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
 }
 
 pkg_postinst() {