Patch from 3.14 branch to fix crash when autostart conditions are wrong, use new location for defaults list (#534790), update that list to fit new names for .desktop files in 3.14 cycle.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 546 insertions, 6 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 5f1447b07c4e..dd9fc96bac76 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.345 2014/12/22 21:25:39 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.346 2015/01/18 13:41:37 pacho Exp $
+
+*gnome-session-3.14.0-r1 (18 Jan 2015)
+
+  18 Jan 2015; Pacho Ramos <pacho@gentoo.org> +files/defaults.list-r3,
+  +files/gnome-session-3.14.0-validate-autostart.patch,
+  +gnome-session-3.14.0-r1.ebuild:
+  Patch from 3.14 branch to fix crash when autostart conditions are wrong, use
+  new location for defaults list (#534790), update that list to fit new names
+  for .desktop files in 3.14 cycle.
 
 *gnome-session-3.14.0 (22 Dec 2014)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index e3a194329754..e85c5e4c9e40 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -6,16 +6,19 @@ AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f5
 AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0
 AUX defaults.list-r1 16386 SHA256 e98a66ad71c7e2233334ec5484b768cfd91e38fa428ec376c0ef1a3d8ca7116f SHA512 bf98a58dbcd0673f2cd157ed867a0bb282108a28466347524f7dadcf6d1c791404d642b5373a9d4eb50a965beafc1c278edfb0423b3112e65f56227561429939 WHIRLPOOL 84c8c32b8f45be1120e50c6e497a8c723b954e6da34c13a85ac3420c6c7cb4cb7eb2f93a83cb05598f5b3c22fe5530ff4db5c65a872d71a620ce1418ee8cb317
 AUX defaults.list-r2 16773 SHA256 ebb1be82f7a24e2e3a82ccb93ca5a19a348f1d00330b03bbba27124dffa816bf SHA512 2e761609871e1508136ef9a324a506ac4318d53727445dbcc8ddcf8e7b44f8f6172834dda3aa5e8f9c2ab7fc186c6c674adddef8c3bf6b4e9467e7570867ee65 WHIRLPOOL 0d42647906e882936db706488ede69bfed824ca91af63d08f9dc5b9f3ffe1b2e076f6c0f210e24da173b06c1e793827118c8248f506eff89b95e083678ae7396
+AUX defaults.list-r3 18139 SHA256 2cf0a75866db862cc46b2ef881c4c373942609d8433a58bd0d05863198d99033 SHA512 a1fb6d0b7c7e2c1e5ea326bf9ede796f56d5b30e3891e0e5876a9ae8d26aaa6abf56a184a11befed375a1019eefc25ac5507883418a24e2f829533dd724ca182 WHIRLPOOL cce345a27d6dc00f70c04baba4410fac8f49adde7bd7b870f766c388c0b4fd1cc487930d73189c9aedd2fc87e1774687dfb0ac934d15a1fc9a9db82679d77910
+AUX gnome-session-3.14.0-validate-autostart.patch 2366 SHA256 5b1af5294ba908a432e12d7af920f95bd7d907d369f54c072bf4f00a90afde63 SHA512 b0a677efe71fb10f3127a3be0162b6da173c4a3207596a057ab565281d1aa7051af9fe922840660ae74fadca661878d24c2e24f854273c6e9c8e711b4babff75 WHIRLPOOL 1003c00f5ba6a595015a37bef1390138c0152718e77df66dd30d9905c096e02774d5ca5eb237c37cce9755d167bead34797491e23e34f6725ff610ff76ab6555
 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517
 DIST gnome-session-3.14.0.tar.xz 736128 SHA256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184 SHA512 7a1b1bd229e38963d5e104fd9b649ab597b4026a59b87820c8517699e63cb066f2aa52b74eb30a052dc4017c30eb16dc16a779a14580af9c1e876edcdd9bd020 WHIRLPOOL a756904a53c7e84dee6d85a2066fe8993f338021e1c07d65c025b1cbae03fedaa169fd19c02203dfc962b69b99d8d3926c17324f15e62e7b6c7e633927140cfa
 EBUILD gnome-session-3.12.1-r1.ebuild 3391 SHA256 39f591221ab7472bb8ccb229c94912f511c0d6bba319bbe4b87f3e2db8dfab65 SHA512 0cbf360c5cb9192eb2c173194d6a3398010458c81eb003ce8736c48155e222d6aa16fdb4060c2ad6c947492d7cf9d0619046818a531bef9ac3c154e3238500d9 WHIRLPOOL 67e3afe45b78da02a7cfbec00dde337799bfce912daac4a8b5ad13f6b6ccd29f19fffdfb1dc4fc9dbfc07da4a226e848b7faf35afe1a806699541451bf7c15c6
+EBUILD gnome-session-3.14.0-r1.ebuild 3505 SHA256 c419f565c0a102a77933b31cab316d5a82f14092f65b83e71bd99bbbd271e9f6 SHA512 74ae81c8b654ee9ecebc8d8ecc77b6d2b33a9c20a1cf4aaabc360a207e82379037d8a9edc9e8c96c5af6cee78cab3fc34f7bf2be91e961a4e27e61e34213e849 WHIRLPOOL fe92fb1740d913999711d750a080071262086bec83b251451fb6be4d6d4841306f32dbd541c57d7c49a728218d3f31f2b50be151a7d933c32b34cf500aa7deeb
 EBUILD gnome-session-3.14.0.ebuild 3388 SHA256 e2ef9f2f9b56d4378b6db4fb67b60fa3ecac69ffa7960df85054fa4a81818f75 SHA512 7b923b193ac191c6ea5c945802775b344663c9ab442e10451a10a82bfa37878dbbe1ecd009f48e0b2b42d864944502e157e442ca834d10fa8e45ff4e4eb2fe1c WHIRLPOOL 1947d4ba6e07741cb15349e4bc24853b472ad94350091e2edc7a9eb2fd4e44f9c4e5e0130302bbc22e211ca72dff0007074849c3755038dde020e1fb1d3377eb
-MISC ChangeLog 52492 SHA256 7d1fadf4524de71ce0ce3eb2e3513e5e21cdfe334af640f37e096e637fb69393 SHA512 2e2a436a1378f1b50e7ad1ea749eda3448fa5eea36510ed8c4673485898c647abd3c67a1c229c87cb1d91b88789a1d56bd0ca5e54f1c6667168e3580d91bef32 WHIRLPOOL 932100c5abdfd186c152ba683e08d1e4a70792e338b4f7c0dc9ebf3662a30b85b17bf8ccb63811e2375a52c085af1ae0b9e060ae362c828cce4747b26f980642
+MISC ChangeLog 52890 SHA256 78e8350c565dc09059ec88d00a45f0d026b6823b1eacb811f6fcda9f895f955f SHA512 336e0d738c93357930ebb214c61f24bdabe6655a0cb71bed625b744a87c54b1d4d6ece3b93fa6bee3fd8f99d612d6a2f7f4e068a5001d79ca0fa4bf2a0553506 WHIRLPOOL 92edad072d9bd385990d60cb8a42cc2c7d55e6ae61039fd1bbb82b4fde73e3e4e04873453c9219896b915c0cbf4a9c5668449e2e489940cbd27872a8f414a1de
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYjFQACgkQ1fmVwcYIWAafrwCfSXl5vg3hrk8fwglPni9aZgDh
-ec0An043e0InTD0RShSBcG5iHVh3Yrit
-=I/wX
+iEYEAREIAAYFAlS7uBQACgkQCaWpQKGI+9QW7wCfWRWVYqAniwmotuo0b+392OX6
+7+cAn3v3VUC1Bq8cmBZyNZOnXdnrqUGb
+=8aUr
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
new file mode 100644
index 000000000000..6c62e32910cb
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r3
@@ -0,0 +1,334 @@
+[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-org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero-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;
+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=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=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=gedit.destkop
+text/x-php=gedit.destkop
+text/x-python=gedit.destkop
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
+application/javascript=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=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=nautilus-folder-handler.desktop;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;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/gnome-session-3.14.0-validate-autostart.patch b/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
new file mode 100644
index 000000000000..eec1484ca194
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
@@ -0,0 +1,74 @@
+From 3442740ad4808f91fb857fb2dda3c24992f0bbdf Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 14 Nov 2014 09:49:21 -0500
+Subject: autostart: validate autostart condition gsettings key
+
+gnome-session will crash if fed a desktop file with an
+autostart condition that references an invalid key for
+a given schema.
+
+This commit validates that the key associated with the
+autostart condition is defined in the schema and defined
+to have a boolean type.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740119
+
+diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
+index 21a6004..437fb0c 100644
+--- a/gnome-session/gsm-autostart-app.c
++++ b/gnome-session/gsm-autostart-app.c
+@@ -337,12 +337,16 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
+         GSettingsSchemaSource *source;
+         GSettingsSchema *schema;
+         GSettings *settings;
++        GSettingsSchemaKey *schema_key;
++        const GVariantType *key_type;
+         char **elems;
+         gboolean retval = FALSE;
+         char *signal;
+ 
+         retval = FALSE;
+ 
++        schema = NULL;
++
+         elems = g_strsplit (key, " ", 2);
+ 
+         if (elems == NULL)
+@@ -358,9 +362,24 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
+         if (schema == NULL)
+                 goto out;
+ 
++        if (!g_settings_schema_has_key (schema, elems[1]))
++                goto out;
++
++        schema_key = g_settings_schema_get_key (schema, elems[1]);
++
++        g_assert (schema_key != NULL);
++
++        key_type = g_settings_schema_key_get_value_type (schema_key);
++
++        g_settings_schema_key_unref (schema_key);
++
++        g_assert (key_type != NULL);
++
++        if (!g_variant_type_equal (key_type, G_VARIANT_TYPE_BOOLEAN))
++                goto out;
++
+         settings = g_settings_new_full (schema, NULL, NULL);
+         retval = g_settings_get_boolean (settings, elems[1]);
+-        g_settings_schema_unref (schema);
+ 
+         signal = g_strdup_printf ("changed::%s", elems[1]);
+         g_signal_connect (G_OBJECT (settings), signal,
+@@ -370,6 +389,8 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
+         app->priv->condition_settings = settings;
+ 
+ out:
++        if (schema)
++                g_settings_schema_unref (schema);
+         g_strfreev (elems);
+ 
+         return retval;
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
new file mode 100644
index 000000000000..0a0f5da204a2
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
@@ -0,0 +1,120 @@
+# 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-r1.ebuild,v 1.1 2015/01/18 13:41:37 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_prepare() {
+	# Validate autostart condition gsettings key (from '3.14')
+	epatch "${FILESDIR}"/${P}-validate-autostart.patch
+	gnome2_src_prepare
+}
+
+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"
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.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
+}