gentoo resync : 25.11.2020

2 files changed, 68 insertions, 335 deletions

diff --git a/gnome-base/gnome-session/files/defaults.list-r4 b/gnome-base/gnome-session/files/defaults.list-r4
deleted file mode 100644
index 0f70884acb3c..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r4
+++ /dev/null
@@ -1,335 +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.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero.desktop;org.gnome.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;zzz-gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-fits=gimp.desktop;zzz-gimp.desktop;
-image/x-icon=gimp.desktop;zzz-gimp.desktop;
-image/x-psd=gimp.desktop;zzz-gimp.desktop;
-image/x-sgi=gimp.desktop;zzz-gimp.desktop;
-image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
-image/x-tga=gimp.desktop;zzz-gimp.desktop;
-image/x-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-application/pdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/postscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
-image/x-eps=org.gnome.Evince.desktop;evince.desktop;
-image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
-image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
-application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
-image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
-image/tiff=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
-application/x-cb7=org.gnome.Evince.desktop;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=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=org.gnome.gedit.destkop
-text/x-php=org.gnome.gedit.destkop
-text/x-python=org.gnome.gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=org.gnome.gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.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=org.gnome.Nautilus.desktop;
-x-directory/normal=org.gnome.Nautilus.desktop;
-inode/directory=org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=org.gnome.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=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
new file mode 100644
index 000000000000..37bb6921ed34
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
@@ -0,0 +1,68 @@
+From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 15 Mar 2020 14:34:39 +0200
+Subject: [PATCH] meson: Support elogind
+
+---
+ meson.build       | 12 +++++++++---
+ meson_options.txt |  1 +
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ef5132c6..7f68aaae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
+ enable_systemd_session = get_option('systemd_session') != 'disable'
+ use_systemd_session = get_option('systemd_session') == 'default'
+ enable_systemd_journal = get_option('systemd_journal')
++enable_elogind = get_option('elogind')
+ enable_consolekit = get_option('consolekit')
+-if enable_systemd or enable_consolekit
++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
++if enable_systemd or enable_elogind or enable_consolekit
+   session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
+ 
+   # Check for systemd
+@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
+     endif
+ 
+     session_tracking = 'systemd'
++  elif enable_elogind
++    libelogind_dep = dependency('libelogind', version: '>= 239.4')
++    session_bin_deps += libelogind_dep
++    session_tracking = 'elogind'
+   endif
+ 
+   # Check for ConsoleKit
+@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
+ 
+     session_bin_deps += dbus_glib_dep
+ 
+-    if enable_systemd
++    if enable_systemd or enable_elogind
+       session_tracking += ' (with fallback to ConsoleKit)'
+     else
+       session_tracking = 'ConsoleKit'
+@@ -171,7 +177,7 @@ endif
+ if enable_systemd_session
+   assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
+ endif
+-config_h.set('HAVE_SYSTEMD', enable_systemd)
++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+ config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
+ config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
+ config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
+diff --git a/meson_options.txt b/meson_options.txt
+index 4c05dc6e..512d1528 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
++option('elogind', type: 'boolean', value: true, description: 'Use elogind')
+ option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
+ option('systemd', type: 'boolean', value: true, description: 'Use systemd')
+ option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
+-- 
+2.26.2
+