file-roller desktop file was renamed at this cycle, drop old

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

4 files changed, 361 insertions, 25 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 357a0074e596..7f39dda35056 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # 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.340 2014/07/27 08:44:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.341 2014/09/22 13:10:12 pacho Exp $
+
+*gnome-session-3.12.1-r1 (22 Sep 2014)
+
+  22 Sep 2014; Pacho Ramos <pacho@gentoo.org> +files/defaults.list-r2,
+  +gnome-session-3.12.1-r1.ebuild, -gnome-session-3.10.1.ebuild:
+  file-roller desktop file was renamed at this cycle, drop old
 
   27 Jul 2014; Pacho Ramos <pacho@gentoo.org> gnome-session-3.12.1.ebuild:
   Newer glib is needed per bug #518074 by Hans de Graff
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 0d614519d534..e681e5aa5a41 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -8,6 +8,7 @@ AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f5
 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 defaults.list-r2 16773 SHA256 ebb1be82f7a24e2e3a82ccb93ca5a19a348f1d00330b03bbba27124dffa816bf SHA512 2e761609871e1508136ef9a324a506ac4318d53727445dbcc8ddcf8e7b44f8f6172834dda3aa5e8f9c2ab7fc186c6c674adddef8c3bf6b4e9467e7570867ee65 WHIRLPOOL 0d42647906e882936db706488ede69bfed824ca91af63d08f9dc5b9f3ffe1b2e076f6c0f210e24da173b06c1e793827118c8248f506eff89b95e083678ae7396
 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
@@ -17,17 +18,16 @@ AUX gnome-session-2.32.1-idle-transition.patch 1802 SHA256 6e80574672ff9e4b9a637
 AUX gnome-session-3.8.4-blacklist-nv25.patch 592 SHA256 2c0894db69a13678d12047f14eae213c6ebf1c2b940e9e46a9297ef4ad1e2b8d SHA512 d112f286256f0dc94daf887cf40153a76fccd5684cd9f638510cd1caeeb5de2f51ffe2e298e992a6dab6d7a5ea11e12d0372365ecb2e29d0c2759f7ccc25ed94 WHIRLPOOL 40e1bb37592199fa25a188a8868d83116d336db12db29a7de7ecf611eaf92c239c35233c38f85f45b251e8a974f330ae0bdce4e28854b6a8ad651b261eecd24c
 AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0bd4eef0dec61b07fa9e72d8ca990e64bcfa42dabcb SHA512 dff7f096d562f8b7b661b6eda1d65a3f9a992cd4cd22604034f44ea77ca72b1282b9bced4702ca24e89185f97de54b4a554877b7cbc8a1ca9f55ef15030f3ac9 WHIRLPOOL faa03513c86fec3f313c3a1a14e40d86d2d35b636d5ad8aa70f17ae51424e205ae99dd00670ac41aaa2465e7281c63bc48574a41d5978ca78bf832a51a574ad0
 DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
-DIST gnome-session-3.10.1.tar.xz 767336 SHA256 f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc SHA512 a17fdd1943c118f025a740b22de1f5840a2f8a1a9fc7f8a2720deccf69097391c2d05e6115416c40c5530de60326f6bd729444dd7a3b2aeff115fe547ad94d8f WHIRLPOOL 12237e7bf0bcfb78a9435d9b71937849d1e07f86d111ed143fd0ee0598a0c198eccdf9ca62e1c3229ff1f00c0baded92a98516d712e0be8d3c1aae9586b3bfec
 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517
 EBUILD gnome-session-2.32.1-r3.ebuild 2999 SHA256 8aa4a5faf11e1bf7f268cf9388eacfbbff017fa7eea3b58f23a4ce8d5f1a83d4 SHA512 e820a1bac84f06f9db5a4eb66ce58fe36d590a0c485483eb39920561f0249eefe20a0e5a08bb3dc0866ea8496c3cfba99e6d5bd2a8e77a732f415d939edd9246 WHIRLPOOL f294df3f7a16f871f60103dad6f7e50e4dc68e1416399054a793c325ffc11de3dd0a5b2d601f2f4934bdeba53e75c643fa97b8fa5c837dac9ed17c728138fb6f
-EBUILD gnome-session-3.10.1.ebuild 3492 SHA256 ab0115c4136c75e1e05dfb0f683b7efef3f41e3222af9a6cc8dc74647bbcddd5 SHA512 1ddcb10ce4bfd1c852dcbc4baecf0677c4727d8c2269bf21686794c7ccbd17e53e3a2e53e4563d63ee0ad1cca6c41a0fa311ad78b43fa85eab73f4c084018c00 WHIRLPOOL 99eb12bd27f6ab2b5cee47ab906c6116f89a3e65612a310f0d0711485a8b881a01596052da74c864f89318570600e5c306e9327279e22d095ec17326459b0cdf
+EBUILD gnome-session-3.12.1-r1.ebuild 3393 SHA256 e4f396153f6f47b17fbfd628bc3a4172dc8144511d3ac6158bd5a905c8fc77cd SHA512 6ed9c230feb87b9ef79927afe48dab236babb7f09630fb102b95eab89f09d6158c5cd1a651b779fa91eda6b1ab593a432cf918f4432d3399afca0ea30381647a WHIRLPOOL 1e53c3358acfa048db78f83f13e53ed5eb596af6b204a609dbbc8e636832ab793396d6961de61bcec191a81f70b020e3f1aba5c54787a5a34a65207a69ccf925
 EBUILD gnome-session-3.12.1.ebuild 3441 SHA256 b61ea04691a542561ff1f9d1b5f498739e9f8728dd6231df435082f0ccfdab75 SHA512 7e0af6166c61b04f26ee8257dfc95994b076fa41c03888bc9ea57da022f42fdfc8c032832bf64e8826aac4dc66f63a7a6b502f0803fbe305066cddbf187ba895 WHIRLPOOL 9c750e398c7f3b7f2e3d97c8918c683cd212d67d82778021d55552d525285c5c4ac67879bfa227cf7c8e8a26d551cc0b97e7445e1e394d69e8a5c713bce5c656
-MISC ChangeLog 51223 SHA256 bbfe5a66998d6437b05f5f093585495107dec8e7aa2025496f35f59df14779cb SHA512 e64fe0aafd18a4bdbe79ecdf08e8aaab4110d106e216ac32fc7f2ba0449dbe4af1b7bf7eabbd8d310caf1a06221b054a73cf4b4f92cc2fca741997c4052403f5 WHIRLPOOL cc20324c1ff28ba2e8d36d1a6bd5c79919e32c32f92a7ee1ef2b4f702b8b1a8d41c9086c1cdd96df01e7438a497bbf0438d7945f4d74da6ed1f3d376f394dbc8
+MISC ChangeLog 51463 SHA256 2f5bcd261628ec9a06805c0f80cc3bb7c2dbeab0ab1c06a48a10abba1480d157 SHA512 5a8cb47cd1feed40428bc49839e7b1060d6acd71a296e42ecaea2c9f1e4d0cb214f59bff1669b4fb85023e2c841d8c658d722d7d63914bef97e0ca9e5b4563b6 WHIRLPOOL 44902172ff25997f4441b4a47c3fefe1fd8c34ba3397eafa8ff0b346acb39fe66dc6be4c23e25299cf7c74feee3e816366b853dea5b84b4c5b581941897ad826
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPUu9YACgkQCaWpQKGI+9Q9BgCfU7LSiIgC6PBmyJl6UjcuMbCC
-JhAAn1JWg8+/e10CPSRB64PYAeXz2Kyy
-=mnyV
+iEYEAREIAAYFAlQgH7UACgkQCaWpQKGI+9T0vACeMpevaoaNJHMOnFSyzPEAmf/j
+KpkAn0NnkukLJyBuklcRDdKlvburNfl7
+=P/sl
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/defaults.list-r2 b/gnome-base/gnome-session/files/defaults.list-r2
new file mode 100644
index 000000000000..0d98512dbb0b
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r2
@@ -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=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.10.1.ebuild b/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild
index e2e916da49e5..13d40ac4ed35 100644
--- a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild
@@ -1,18 +1,18 @@
 # 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.10.1.ebuild,v 1.8 2014/06/01 08:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild,v 1.1 2014/09/22 13:10:12 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+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"
+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
@@ -20,13 +20,12 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
 # 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.35.0:2
+	>=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=
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
 	virtual/opengl
@@ -59,6 +58,7 @@ RDEPEND="${COMMON_DEPEND}
 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
@@ -69,25 +69,21 @@ DEPEND="${COMMON_DEPEND}
 # gnome-common needed for eautoreconf
 # gnome-base/gdm does not provide gnome.desktop anymore
 
-src_prepare() {
-	# Allow people to configure startup apps, bug #464968, upstream bug #663767
-	sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
-
-	# Blacklist nv25 (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.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 \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-session-selector \
 		$(use_enable doc docbook-docs) \
 		$(use_enable gconf) \
 		$(use_enable ipv6) \
-		$(use_enable systemd)
+		$(use_enable systemd) \
+		UPOWER_CFLAGS="" \
+		UPOWER_LIBS=""
+		# gnome-session-selector pre-generated man page is missing
+		#$(usex !doc XSLTPROC=$(type -P true))
 }
 
 src_install() {
@@ -99,7 +95,7 @@ src_install() {
 
 	dodir /usr/share/gnome/applications/
 	insinto /usr/share/gnome/applications/
-	newins "${FILESDIR}/defaults.list-r1" defaults.list
+	newins "${FILESDIR}/defaults.list-r2" defaults.list
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/