Update default gnome file handlers: fix nautilus-3.6 directory handling (bug #449486), prefer chromium over epiphany, fall back to libreoffice or openoffice if abiword and gnumeric are not installed. Drop old 3.6.2 ebuild and propagate ~arm keyword to -r1 and -r2.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 377 insertions, 16 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 62ca6f9b4a05..b94da4d9869e 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.316 2013/02/02 22:35:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.317 2013/02/03 00:39:14 tetromino Exp $
+
+*gnome-session-3.6.2-r2 (03 Feb 2013)
+
+  03 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-session-3.6.2.ebuild, gnome-session-3.6.2-r1.ebuild,
+  +gnome-session-3.6.2-r2.ebuild, +files/defaults.list-r1:
+  Update default gnome file handlers: fix nautilus-3.6 directory handling (bug
+  #449486), prefer chromium over epiphany, fall back to libreoffice or
+  openoffice if abiword and gnumeric are not installed. Drop old 3.6.2 ebuild
+  and propagate ~arm keyword to -r1 and -r2.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gnome-session-3.6.2.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index e9ec471cd395..033641a591e9 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 10-user-dirs-update-gnome 264 SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931 SHA512 57ffafeaba34ed4102ba7fc7b1ac91db8fce4ee5d122daebe1bff28f4dc2da45bc85b825ea9fae22f70de4f7941ab602b42da661e632c692350f1d3d589c62c2 WHIRLPOOL 3435353ef4be7e32ff3c5842a54f8fad7b705c248e8ddf1a19151dba3ab55c452c45db5e3f53c128a3e165986d44c366297adc7abf3e4d890c4df3847286e88f
 AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6
 AUX 15-xdg-data-gnome 227 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd SHA512 f6039b3640b69f468f47eeeb3bd0116b470930cbfab93630c065b17355b3686eda00007311b2b8d0f5c24dfb902e1175aae11a8f930a9e039ca6945e84af4e8f WHIRLPOOL 4a0eccdd48ea38a3edcbae80c665ff1126c4356dff47910ebe1b2fa428649887d073f0d7d7ea44c632a6e06308d0b7c04c5d6b9796e9b39dc78a568e73882669
 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e
 AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0
 AUX defaults.list 14505 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354 SHA512 8f343fff8ad08bf98e2c96157c04a6c3253d719455293e8296a8c8c383c94bea3666b4936ae5687d1d5de2d04a599271e3520aff5e52474eb63a87d1fc5c24e8 WHIRLPOOL ee81a0a72b87c3f10b7dc9a1479d296d1d885eb10ec06cc517969a9c4fb3f7229e70f5a8c470152492bc52730afde4f06068289f09981555e06a2a6635bdd92f
+AUX defaults.list-r1 16386 SHA256 e98a66ad71c7e2233334ec5484b768cfd91e38fa428ec376c0ef1a3d8ca7116f SHA512 bf98a58dbcd0673f2cd157ed867a0bb282108a28466347524f7dadcf6d1c791404d642b5373a9d4eb50a965beafc1c278edfb0423b3112e65f56227561429939 WHIRLPOOL 84c8c32b8f45be1120e50c6e497a8c723b954e6da34c13a85ac3420c6c7cb4cb7eb2f93a83cb05598f5b3c22fe5530ff4db5c65a872d71a620ce1418ee8cb317
 AUX gnome-session-2.32.0-session-saving-button.patch 21424 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97 SHA512 e9d506fbb690a560c362f4e16e4bd7353aaa437faa2e36673456fab294e555ad61d4774821acc976a44894a81a42b34c867e64e1aad27eb5fa946bf5880ac8d3 WHIRLPOOL 493a0fe84f8d755ec843cc6e86215eec1a788dda1d494a58e7048747c995ad666ed06932a2cf788e1c5458bd9c245251232ef9f6fc2e78d0182dfd8be4f51edf
 AUX gnome-session-2.32.1-dialog-size.patch 953 SHA256 8f96daba40ae19223d54aa271f79e0a6541e4c936771815a4599077533c6948b SHA512 0ffcbeba40449c1ed0741e0d988b87504741d371b1ce897b013ec4dbdf813f0d632b88f41ffdbd080a50a752e58bce63c17cc80b6550853f01fe8cdb2dd6785c WHIRLPOOL 2f78f956521ee65d0b4e9b3cdfe8b151172d8553c071edc8230363e1cc366866c04e866da7a1a1b56b0363c3aad22b7fcbb3a9e7e9540ede87e2e56fc9724040
 AUX gnome-session-2.32.1-dialog-size2.patch 1114 SHA256 fefa53adb80c531fecc4fa4e67f5faff7ee5cfd33a290c689dca9f2267525f6e SHA512 6fb6d6214051d61470fe50bbb4db4d4f7c0b7475a28f72c485f16dba7a885fde7d7bfc2375b11fc82b5da1a3e0fd6e5d609a6ac70fe6a25a72a3cca2c1bce3c8 WHIRLPOOL 225f5b0ca3fa341c8bf591f66e257fad080f0fcf920625271a395331f3c89d1b1607f7ae13f18796bc8f62bcac7973c24901c9396939b257c5f70fa9a8568eff
@@ -16,7 +20,18 @@ DIST gnome-session-3.4.2.1.tar.xz 725144 SHA256 2fbcf10d4ad8648197fefde2052abd8b
 DIST gnome-session-3.6.2.tar.xz 729676 SHA256 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4 SHA512 3ae043a241695e26bbcfe70cb58263e74bfb62c1859d46828118740e3580df516f17c73d5a348d381ead7886333c71eb9bca2bed6e494f234b8d733a9fd37083 WHIRLPOOL 833cff921461759510fd31cb3d2bf2959d486ccd51971d401f30d85bf93878264e9ebbdba866bb9c3a05aff3a00d0f6d043958407a783dc6f7d9d5d78f62f7ac
 EBUILD gnome-session-2.32.1-r3.ebuild 2972 SHA256 b67ca3d7c561adccea184b8a70e047a0009ead24da57d3a9d508a43f79289674 SHA512 c1ede08752fadb66a2d95f9b01a567170e72943ad71c6bbf23f12e1b70516e0b2de10a394b7811507e84b49164f303f715059b7d8972cfc2d6e66f76826c50f6 WHIRLPOOL 37a7fb42d6d44f76f7d23f7a3158589d9381e2c830e40e593a8b51b70ef00f590a7f7dae3ae0439e80e275a43bc607f47aca31ae2d69c113e7452901021e4379
 EBUILD gnome-session-3.4.2.1.ebuild 3064 SHA256 c4abe9f9cd9505f24cae85cda70825042730b2637d8e270388b2233888ad2554 SHA512 034bd231662c88b3fc9f5fd8f2c0e56434e7e24dc5c352cd2cd3da8c53d4f707fad5a6291282c551cf1fcbf490c02215128867d121097df27b57b4ad75040f05 WHIRLPOOL 7db86cc7a003f507f1edc4c8122ce3de103c11899644f958c657e270e0137ad212244f6e07c5cbe495c118d9d2e45dc64a33d4b46e91a29fd6bf0b4c81d2bad5
-EBUILD gnome-session-3.6.2-r1.ebuild 3342 SHA256 aecfc6127a74e581c19c933d3393d756e69098029ab864cd86de00ab98bb389e SHA512 284f268d624ebbb376a7dd507e8058b267d8b9fb39500844b6740c668253b63e1941af7fa860560ad94485eccd6c3e50f34e14db4ee43ffe191940e82adc5d74 WHIRLPOOL fcf2293b18eef3214f72b015b4e7b3b2a301e717915c80295b0b6fc0b533de17d89709a568711b3a54f591d2844798719a0474e6d158d8427807ceb896724b4c
-EBUILD gnome-session-3.6.2.ebuild 3250 SHA256 2495ec9eb74072a8f2b07937487b9264f9f969fcaab7728209a495c59a26de7f SHA512 0bffe671679fe4738b220cbf9bcdbf56c5185980af9cec1e4f2a29d8126eb0dfafb05ff28954a7d2e20fdc17f182d9d6ce7fbec3040b6ffbe20f0c90949782ae WHIRLPOOL 97b3327790ad6340dd6bea15de9b0a46f6bed13664a5044284742d1c7f085d54e33da02bd78d9f13fd5393d988adc3a01d63deb7f34091b5272c20377018949c
-MISC ChangeLog 46960 SHA256 ffad575709b3078e0fbcc7442b6af87b3a38928344b9aa19d91d74568fbbca9b SHA512 6ab781bd5aace47c420555f664f59eac90763c8a1cb92bf861803f4e1ae0b2317abeffc7b5b40c1e92cd3a4d3251be1add61d9775018951146c2701df3ef51a0 WHIRLPOOL d373d63bb962db700499490f57ff99c40b530249e6e3e41457cc412d6882cf97947f788e808570bff60ad05b4bca45a15023345d57bf4edd34885c9aaf5d4c9d
+EBUILD gnome-session-3.6.2-r1.ebuild 3347 SHA256 8725c722302d8810bd30b09af7abf2d9522d45806cea49ea5571554ab9143219 SHA512 4325bcf521ac186f45fbb1b9db2270ee0b6849e9702f95694acc3b463c24023de49552c490b7eed0b07e84719a06878b8f81bbb20f4b0296a022679d61de13e7 WHIRLPOOL 8689ea7d6dc13d1f019c1e48ea006703d49fa57924d12c1e6f3fdb931d25df1fd59a7c7f6ef4d97086143b815bfe04c2fe93e1b805cd0081625ac922a29e9a49
+EBUILD gnome-session-3.6.2-r2.ebuild 3365 SHA256 b2adb00a1c10ef4a8ce0a6b96f31b7eb76193fae38320df9c30c494c43f89c6a SHA512 188f8abc64f80365cb7d83733c9dfe7653a2b732d4c5080aae171f7aaec387dc7aa2d339fc36b82b47ee7aa5c0d36a63eadf283b969c06ed3d9fe5a95cc5dc12 WHIRLPOOL 9778e21e4f0f7f62311422b213534fdea534b9abd1521c376700f3c58aabbb68f7c7954f77e8baf52aa29a90c84d279921de4323413ad028a6fad88a2ef1d372
+MISC ChangeLog 47459 SHA256 dbcfdff05a5eaed848434675fec729b02e69cd05461c3c1d1b86288dba476d2e SHA512 60ad2fa37732ca3b6daa7a6f0a75461ea335acd3614fa66eb243fce2280e15e2311051cac769c08a605b8e0aa5bfc75c47abb730ec4f2c5c97ea19bb2d27ce15 WHIRLPOOL a99d59c8e74de390cb7733faea2c046895280a34349070bb49c87279786c64dff688604ee7070b022cc60a94bbecbf9f291f0a7123267ff62de75b98c03d8c71
 MISC metadata.xml 404 SHA256 7d584786789e431ffa23dd78cd547c676fb110882f60e7f3ffe579c7d2669b3a SHA512 cf707ef9e6cb0aa4122a563fbbc9690849e670d0cd4a6ebf87b40f4361f8c7ca069f2fde486b9784e9b1012790d4a41aa551b201f551963f7b473781d80b821d WHIRLPOOL 0bcb17b7140fe056c92d1c920d5e79d06aa5a628e692baa5c588c0826586d92a723ad4df5743f2996ce1de8e0fe391f88535f1349370ba6e0b668c963b498267
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRDbG0AAoJEJ0WA1zPCt1hJuAH/2PSnKKwZtnAzFl+fOBXSIG8
+BqoRPTb5OtWft0L2fuHbHF8MbNwTQtX2RWdIjoAXGIPiNz0t6BFyZ3afymB5XHDv
+uYfzrtL2y3PvwN0h4CB9trQwMGvTz0qOANV6U7lKuSgJ0tBOUm69WvgWiUW1gnTr
+tAmkgK6rHA4J1OQ+/4kCGDsN0VATc45d3vPF3rS4eU2YBxzIuL+BYpz0JH9N542H
+4AEXuuBHcypRbRMDepM3Ems2aClGobQewWgKwZ53+h9J2h3oxSGN58USz4uoHIow
+wApGg3BlqqRLSas8Uv2r9bQoZdIEpeQRN7GACgknghR0OX10/vVj0CMMl+zL7fA=
+=937E
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/defaults.list-r1 b/gnome-base/gnome-session/files/defaults.list-r1
new file mode 100644
index 000000000000..e3aa8541bb41
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r1
@@ -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-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/gnome-session-3.6.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild
index 544e365d721c..cfc74ca23ef3 100644
--- a/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.6.2-r1.ebuild,v 1.1 2013/01/22 05:40:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild,v 1.2 2013/02/03 00:39:14 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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
diff --git a/gnome-base/gnome-session/gnome-session-3.6.2.ebuild b/gnome-base/gnome-session/gnome-session-3.6.2-r2.ebuild
index d7ba25438267..5e6b8439203d 100644
--- a/gnome-base/gnome-session/gnome-session-3.6.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.6.2.ebuild,v 1.2 2013/02/02 22:35:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.6.2-r2.ebuild,v 1.1 2013/02/03 00:39:14 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -70,20 +70,22 @@ DEPEND="${COMMON_DEPEND}
 # gnome-base/gdm does not provide gnome.desktop anymore
 
 src_prepare() {
+	# upower-client problems, bug #450150; fixed in 3.6.3
+	epatch "${FILESDIR}/${P}-upower.patch"
+
 	# Silence errors due to weird checks for libX11
 	sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
 	gnome2_src_prepare
 }
 
 src_configure() {
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable doc docbook-docs)
-		$(use_enable gconf)
-		$(use_enable ipv6)
-		$(use_enable systemd)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-deprecation-flags \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable doc docbook-docs) \
+		$(use_enable gconf) \
+		$(use_enable ipv6) \
+		$(use_enable systemd)
 }
 
 src_install() {
@@ -95,7 +97,7 @@ src_install() {
 
 	dodir /usr/share/gnome/applications/
 	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list"
+	newins "${FILESDIR}/defaults.list-r1" defaults.list
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/