Version bump for Gnome 3.16. Clean up old revisions.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

6 files changed, 30 insertions, 813 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/Manifest b/gnome-base/gnome-session/Manifest
index f00f32b575a0..c21dcb9d3d19 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -5,34 +5,19 @@ AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf3383
 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e
 AUX 90-xcursor-theme-gnome 384 SHA256 e54babb8c0d0ad33eaa0f80985c802b0656fad9d1d60df2f1aa979f38356d8e0 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b WHIRLPOOL 68bc6c55d6a10cd14539eae6cc34f746c2bc485f96112317213f89c579a9ae7b259c0969155e2c8b30e88d62e19196bcdec559bb2cf3a3816034957c1fa5997e
 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
+DIST gnome-session-3.16.0.tar.xz 764808 SHA256 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d SHA512 4f02e73ab632ce0c2b961f1d88d93ef62fb6ebfa39d98bf12e672ca7cd9680d07aeffcd3c8792eddcbd9b5e13b0ef87d064352d8f209b3befd8445c1ba17e485 WHIRLPOOL 18ae75ccf4c3b67dfb8b941552317f5739a9ac54d9e8ef2c220e388f2f91687bee05127dcdbd132137b8f7996585ce1ba2a82877cc00eb787d7c5e24d032faf2
 EBUILD gnome-session-3.14.0-r1.ebuild 3503 SHA256 90b603a78124d5ee2eabd8c73bf443be2ee0fcf0424125fde23212ae4c8d65cd SHA512 362fe5e024b6a3ad4931b9e4dcdf90f14923bd786fc2cc3c32eca5a7fc47e8adc29f4eab67aa48ed7cda8ae4bce47696462a41643314cc091627d82e25c22845 WHIRLPOOL 5ed001e932f7afeec0abe84024aaa90b2b532b3fbb8b00153b58673410dfd8f8fdc70787ffd7702c89eada575f0752f8ba52331cdfb43a733c0fbc4bfafaf53c
 EBUILD gnome-session-3.14.0-r2.ebuild 3774 SHA256 48bea8b6242643a18eac3584474adc51b440e7964784b531516593b7a9ac17a0 SHA512 3dc91d657dbc831ddf9501b961a678b3602d33920613316d1e9311073dcba888219bd75f728f4cf24a729eccb973c0218a502784dc8b6601693a8286d0e802a3 WHIRLPOOL e8a0b667b699ff3d9be59deffe0090f3f792c03baa103e7e04b22df71bca675bc6251325c5989afe0c957a20c4a87520a48126dd690d158cc71e050aa6dd9e58
-EBUILD gnome-session-3.14.0.ebuild 3388 SHA256 e2ef9f2f9b56d4378b6db4fb67b60fa3ecac69ffa7960df85054fa4a81818f75 SHA512 7b923b193ac191c6ea5c945802775b344663c9ab442e10451a10a82bfa37878dbbe1ecd009f48e0b2b42d864944502e157e442ca834d10fa8e45ff4e4eb2fe1c WHIRLPOOL 1947d4ba6e07741cb15349e4bc24853b472ad94350091e2edc7a9eb2fd4e44f9c4e5e0130302bbc22e211ca72dff0007074849c3755038dde020e1fb1d3377eb
-MISC ChangeLog 53499 SHA256 860adac16215a773d0981c20b02725831960183cdf3367754d6ea14350842466 SHA512 f42e50d3916d9df566977c5978cf6ba3ee802e650e84342f432bd7fe82fa02722712f20dfd9caf8ae8230c1e07d2224f817cf1c8c4c20678f6f9dc43a0550a9f WHIRLPOOL 2ca8c799b9e6f54ecf7a7a00c4661180d575aac2ceb0f6e3230d18c2786f0133f30384539f8944189410afda28b2a8add1ba679da95f44701296e851416be482
+EBUILD gnome-session-3.16.0.ebuild 3656 SHA256 afe7b8065ce16974f1f2712d8683c35e287b883a98d9348064a7d38998a65263 SHA512 0e4fa1f5e6c2c8c9eb1d623b6ef3d90003b787fe15f1cbb54ac05beaf3f2059db83eb97c4eed7b0cf90b0c5d7dd60aa7471af84ba830677abe840102466ad738 WHIRLPOOL 9238723e8da7ca0821cb09887593369d781993beb1cd1a00cacae128dab925daf494bfa9fbb3436f0ed312e0d2e2ab13cc7dba1fe34ff9fbf4835c0fadfc1bd3
+MISC ChangeLog 53789 SHA256 c245506d2c43d6b21100599f04efec42ea6c7179167844172500f152def47ef4 SHA512 22e54a10bed81320f9a49f06abfdb760e24d026c5235768bacce60306f19f848fd646be9a639d62e47aa5d5c8de3ffd183ca862d10ea858000c9055d34224498 WHIRLPOOL 26ef1fe59dcf4937eb50e80eb457d1a2aa5b528f6daf400e3410839740510c62dc3e57627df3ebc7d1e814337cd4a790a31a0aea1d4446265f251069f2ced380
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVDwDxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNfVoQALJr5dVBqhFN7hisep2QnZZA
-O5iBUnSVsOrdz0/Yd/tm4geZ5orsnFcghi4Tha+9/i9LqFUnVX/tHsyTMXxrUNkw
-JmK/EeXMCfq2dVmK6n0/wMEqSZNa5BPANTH6SvBBlZsYV5WzZDUce1/k2zW11ehs
-qg4BoqF7uCCitfDjhNflG6y1r6iLjLDosxDnb+jP/6RwzQv20slo8i9/5ib5weZM
-ViF59Agl2SggmsmjE22gthEvHt+MMoq6oqSOV2xbToKktz0nSJ1F3UfPnox+T34b
-8kZ4wrpDAsGbPl3hOTQ3qVbri5cA8zA64zk9h5Y+ftd3tOTa7sPq4ywS300ycRlC
-gp32eZ57Ndp+2M7fHsUFtZbmIkmS3c95oN3d6J1ugoOSETaF+AA+RvdkERzjGaQs
-h9wU52v/8NidmzyO1QM1t3+6W5cPCnEBVHv/GqeqBMiSt731/C8N+wYAA1fVyTJd
-qmekSSigHLf/+WToCh/Hq5GiKPRswSI0EOLL2NGhCgc0BVVZh8Gx05H/3hueqDf4
-i06kwTRSdV9sBu9JZ44jS2aDpUMxQz8PlsqfkzakhYGnLnAWjIFmIOVheHrkpH02
-zvOFgk4YdQXx2eYqbJrBZFCYqnz7n5vjaJhFvp3jmx/vo1TjFnIz2NUsWkvkbuO3
-UrGWWC9rlBIr+hQR0ly5
-=t6zO
+iEYEAREIAAYFAlV3Dm0ACgkQ1fmVwcYIWAZh3wCfVMK0o3MIpAsMDN2xZZN9HVE5
+Ot0AniE7qEDUapBm1qXASMoelo3I2+hQ
+=0RXh
 -----END PGP SIGNATURE-----
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() {