gentoo resync : 25.11.2020

7 files changed, 86 insertions, 498 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 90e6492f78a2..e7a6a626f92b 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -2,13 +2,11 @@ AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de5
 AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc
 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
-AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
-DIST gnome-session-3.34.2-patchset.tar.xz 10196 BLAKE2B f79331c554b3004dc92d6b9d78ecb9575ad9ff071ef443ba4dca47e358e1c9bc2ecad3a43298bec7ad9e33aa85cb3fbc400f0a8739e6b1b1ebcfe3b8fd590ee5 SHA512 50d0d99bc594abdd05b2351c00db7f170282459360aaac0148a224d7e30e99283588596e84ff82bffab647cfd6a01a306a5c951da77d68e50ad8e146d3aae62a
-DIST gnome-session-3.34.2.tar.xz 474692 BLAKE2B 5b928a4632966bc12ff94ae76079cd39352dc7008e9a1044ccc63e1ba588d26a6a5812a69a995f86cef6f9f2f18ae2865793dd28335218308ada85969966fb75 SHA512 23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182
+AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
 DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
 DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
-EBUILD gnome-session-3.34.2.ebuild 3992 BLAKE2B 0c65c6a8ec8e14cc03a78ead0e84a676e024d42bddb23911847e84de81d9234a1b3b8110ba054f3d6889f13f0932c8b553bf18584b0a7dd6bc49b386fe108a9a SHA512 809e0a482a8149151393f7ece8b544505f4d14a00e703831173eaa6182ae8baf9092acb7232f05dbf9b3e7f7753a6d97594f3d8787c1e2436452962f89e5caa1
-EBUILD gnome-session-3.36.0-r1.ebuild 3883 BLAKE2B e6b213b12f2ad801d4837b60e05fe1bce0bd5fb25f32971259339de3aecfa6b10e39869f69075483cbaafec30634a2274fbe8935e5241cbf1c8f9b179b0176f9 SHA512 142033b406086a178f60bf2155c27356cae5ac68b29f466fa2d684e5f7dd29cce94342139c6b2d8268c8040bdbc3d7339de0299b4f269928ddb36600d5ce87b8
-EBUILD gnome-session-3.36.0.ebuild 3885 BLAKE2B 4e1160342b21bd78bc65b47780e9f62053b28e1628e7cf5a737b3147a4a5aad5eebc69a90104e73f0f95f3e00aefac3273810dfa5340aae0d94cd33830201758 SHA512 0770a77d8ec4abe3b615c68fb4a02074a6ef77900e063cfba4a6cd9eaaecf3888752fe1764dc90a035a7c563e1865d19b82815d134f14a217b5870818d956331
-MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
+DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
+EBUILD gnome-session-3.36.0-r1.ebuild 3642 BLAKE2B c52cd83b7462c1230c2363faf7fc698351f5efb07cf092d1196fcb481e389ef7d83dd4e3ce69850064cd9051edc215ab67c14f40fd42c92a04910ffe4dd2b342 SHA512 f3b016e3938d02278c24d3c39907f745867f8178f3b0e97c371ca503666f977267a3ae758318c39581f42ad6ff4bc263873ca0248e6d37750e34a3a84e43de97
+EBUILD gnome-session-3.38.0.ebuild 3445 BLAKE2B 52382419142873b4234452eb8ffd23dc6ecfae34886232953b99e7a009633605ba6ce0df3cb399708685eac17b09c0f7c29f3b14f519b8e98235c24260b5f928 SHA512 04884bcb7fe5648df55a2099a38ea46a75c69dbdc8ca9b039076482f66022f0968d63088b44b2ca186bd249a7e28047108d0eb5b1f86dfb8ae13f75363a4f7f9
+MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/files/defaults.list-r4 b/gnome-base/gnome-session/files/defaults.list-r4
deleted file mode 100644
index 0f70884acb3c..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r4
+++ /dev/null
@@ -1,335 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
-application/x-dia-diagram=dia.desktop;
-image/bmp=eog.desktop;
-image/gif=eog.desktop;
-image/jpeg=eog.desktop;
-image/jpg=eog.desktop;
-image/pjpeg=eog.desktop;
-image/png=eog.desktop;
-image/svg+xml=eog.desktop;
-image/svg+xml-compressed=eog.desktop;
-image/x-bmp=eog.desktop;
-image/x-gray=eog.desktop;
-image/x-icb=eog.desktop;
-image/x-ico=eog.desktop;
-image/x-pcx=eog.desktop;
-image/x-png=eog.desktop;
-image/x-portable-anymap=eog.desktop;
-image/x-portable-bitmap=eog.desktop;
-image/x-portable-graymap=eog.desktop;
-image/x-portable-pixmap=eog.desktop;
-image/x-xbitmap=eog.desktop;
-image/x-xpixmap=eog.desktop;
-image/vnd.wap.wbmp=eog.desktop;
-image/g3fax=gimp.desktop;zzz-gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-fits=gimp.desktop;zzz-gimp.desktop;
-image/x-icon=gimp.desktop;zzz-gimp.desktop;
-image/x-psd=gimp.desktop;zzz-gimp.desktop;
-image/x-sgi=gimp.desktop;zzz-gimp.desktop;
-image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
-image/x-tga=gimp.desktop;zzz-gimp.desktop;
-image/x-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-application/pdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/postscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
-image/x-eps=org.gnome.Evince.desktop;evince.desktop;
-image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
-image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
-application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
-image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
-image/tiff=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
-application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
-application/x-7z-compressed=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=org.gnome.gedit.destkop
-text/x-php=org.gnome.gedit.destkop
-text/x-python=org.gnome.gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=org.gnome.gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-sc=gnumeric.desktop;
-application/x-sylk=gnumeric.desktop;
-application/x-xbase=gnumeric.desktop;
-application/x-xls=gnumeric.desktop;
-application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
-x-directory/normal=org.gnome.Nautilus.desktop;
-inode/directory=org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
new file mode 100644
index 000000000000..37bb6921ed34
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
@@ -0,0 +1,68 @@
+From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 15 Mar 2020 14:34:39 +0200
+Subject: [PATCH] meson: Support elogind
+
+---
+ meson.build       | 12 +++++++++---
+ meson_options.txt |  1 +
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ef5132c6..7f68aaae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
+ enable_systemd_session = get_option('systemd_session') != 'disable'
+ use_systemd_session = get_option('systemd_session') == 'default'
+ enable_systemd_journal = get_option('systemd_journal')
++enable_elogind = get_option('elogind')
+ enable_consolekit = get_option('consolekit')
+-if enable_systemd or enable_consolekit
++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
++if enable_systemd or enable_elogind or enable_consolekit
+   session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
+ 
+   # Check for systemd
+@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
+     endif
+ 
+     session_tracking = 'systemd'
++  elif enable_elogind
++    libelogind_dep = dependency('libelogind', version: '>= 239.4')
++    session_bin_deps += libelogind_dep
++    session_tracking = 'elogind'
+   endif
+ 
+   # Check for ConsoleKit
+@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
+ 
+     session_bin_deps += dbus_glib_dep
+ 
+-    if enable_systemd
++    if enable_systemd or enable_elogind
+       session_tracking += ' (with fallback to ConsoleKit)'
+     else
+       session_tracking = 'ConsoleKit'
+@@ -171,7 +177,7 @@ endif
+ if enable_systemd_session
+   assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
+ endif
+-config_h.set('HAVE_SYSTEMD', enable_systemd)
++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+ config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
+ config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
+ config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
+diff --git a/meson_options.txt b/meson_options.txt
+index 4c05dc6e..512d1528 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
++option('elogind', type: 'boolean', value: true, description: 'Use elogind')
+ option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
+ option('systemd', type: 'boolean', value: true, description: 'Use systemd')
+ option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
deleted file mode 100644
index 98e279b11004..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl,gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-183:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# gnome-settings-daemon is assumed to be >=3.33.90, but this is about
-# removed components, so no need to strictly require it (older just
-# won't have those daemons loaded by gnome-session).
-# 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).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.23.2
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	# Various patches from other downstreams + elogind support
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
-		$(meson_use doc docbook)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# 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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; 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
-
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
index 44a8e800324b..0feb7789d569 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
@@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -30,7 +29,6 @@ DEPEND="
 
 	systemd? ( >=sys-apps/systemd-183:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -78,8 +75,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -117,8 +114,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
 		ewarn "gnome-session won't be able to correctly track and manage your session."
 	fi
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
index 4f42ede4e067..8d4354bec096 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
@@ -2,23 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit desktop gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.0:3
+	>=x11-libs/gtk+-3.22.0:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -28,9 +26,8 @@ DEPEND="
 	media-libs/libepoxy
 	x11-libs/libXcomposite
 
-	systemd? ( >=sys-apps/systemd-183:0= )
+	systemd? ( >=sys-apps/systemd-242:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +41,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -60,8 +56,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Various patches from master (no 3-36 branch yet) + elogind support
-	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${P}-meson-Support-elogind.patch
 )
 
 src_prepare() {
@@ -78,8 +73,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -88,14 +83,11 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	dodir /etc/X11/Sessions
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/Gnome"
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
 
-	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
 	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
 
@@ -117,8 +109,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
 		ewarn "gnome-session won't be able to correctly track and manage your session."
 	fi
 }
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 0a5d0e69d176..7b4ca44a6603 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 	<flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 </use>
 </pkgmetadata>