gentoo resync : 14.07.2018

9 files changed, 688 insertions, 0 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
new file mode 100644
index 000000000000..5a1bfe04695c
--- /dev/null
+++ b/gnome-base/gnome-session/Manifest
@@ -0,0 +1,10 @@
+AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de56631d06b888292b96fd7179e60593c3b9c6c2da86a589a45ae35ccb0e03f169895462044b9fb3e1d600e768a65da1 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a
+AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc
+AUX 3.22.3-xorg-default.patch 1929 BLAKE2B 0af17b6f73c4c431c4815dd3f1f23a7aef81727ddc179f3f8ad5aa10875562ecc6904e35ccdc55aae76dc956423bd30c4469768a5797023ab79da7e84d125599 SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1
+AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
+AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
+AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b6f506e36000279610a8742e9a30b1cda5ad364f562e3ac043a2e887d95dfa82c1aa2f8ed2d255aeb2a7 SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3
+DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
+DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
+EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
new file mode 100644
index 000000000000..61fd08c51141
--- /dev/null
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if type xdg-user-dirs-update &>/dev/null; then
+		xdg-user-dirs-update
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
new file mode 100644
index 000000000000..5eaa6985d9dc
--- /dev/null
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if [ -z "$XDG_DATA_DIRS" ]; then
+		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+	else
+		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
new file mode 100644
index 000000000000..02eea39715cc
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
@@ -0,0 +1,58 @@
+From a709a07bff91a7b2dd4e4a412090850a73937999 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 7 Mar 2016 13:36:32 -0500
+Subject: [PATCH 2/3] data: switch back to Xorg by default
+
+Consensus seems to be that switching to wayland for user sessions
+by default is a bit premature.
+
+This commit moves it back to Xorg by default.
+
+We'll save wayland by default for 3.22
+
+https://bugzilla.gnome.org/show_bug.cgi?id=763266
+---
+ data/Makefile.am                                         | 4 ++--
+ data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index ae08730..d0a7310 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir)
+ hwcompat_DATA = hardware-compatibility
+ 
+ xsessiondir = $(datadir)/xsessions
+-xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
++xsession_in_files = gnome.desktop.in
+ 
+ if BUILD_SESSION_SELECTOR
+ xsession_in_files += gnome-custom-session.desktop.in
+@@ -18,7 +18,7 @@ endif
+ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+ 
+ wayland_sessiondir = $(datadir)/wayland-sessions
+-wayland_session_in_files = gnome.desktop.in
++wayland_session_in_files = gnome-wayland.desktop.in
+ wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
+ 
+ sessiondir = $(datadir)/gnome-session/sessions
+diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
+similarity index 85%
+rename from data/gnome-xorg.desktop.in
+rename to data/gnome-wayland.desktop.in
+index d00b3dc..852be87 100644
+--- a/data/gnome-xorg.desktop.in
++++ b/data/gnome-wayland.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-_Name=GNOME on Xorg
++_Name=GNOME on Wayland
+ _Comment=This session logs you into GNOME
+ Exec=gnome-session
+ TryExec=gnome-session
+-- 
+2.10.1
+
diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
new file mode 100644
index 000000000000..13bc453c7854
--- /dev/null
+++ b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+    XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null
+    if [ x"$XCURSOR_THEME" = "x" ]; then
+        export XCURSOR_THEME="Adwaita"
+    else
+        # 'dconf read' wraps string output in single quotes
+        eval export "XCURSOR_THEME=$XCURSOR_THEME"
+    fi
+fi
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
new file mode 100644
index 000000000000..55d39b633257
--- /dev/null
+++ b/gnome-base/gnome-session/files/Gnome
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# This file has bitrotted badly. Someone needs to clean this up.
+#
+
+if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
+	export XDG_MENU_PREFIX=gnome-
+fi
+
+for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+#
+#  Distributors:
+#  You should modify the paths here to fit your distro
+#  If you need to do so, send me (jirka@5z.com) a patch
+#  and I'll try to make the script detect the distro stuff
+#
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+if [ -x "$HOME/.gnomerc" ]; then
+	command="$HOME/.gnomerc"
+elif [ -x /etc/X11/gdm/gnomerc ]; then
+	command="/etc/X11/gdm/gnomerc"
+else
+	# as fallback in case the config is screwed
+	command=`which gnome-session`
+fi
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec $command
diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
new file mode 100644
index 000000000000..5dfa6be6af16
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r3
@@ -0,0 +1,335 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero-org.gnome.Nautilus.desktop;
+application/x-dia-diagram=dia.desktop;
+image/bmp=eog.desktop;
+image/gif=eog.desktop;
+image/jpeg=eog.desktop;
+image/jpg=eog.desktop;
+image/pjpeg=eog.desktop;
+image/png=eog.desktop;
+image/svg+xml=eog.desktop;
+image/svg+xml-compressed=eog.desktop;
+image/x-bmp=eog.desktop;
+image/x-gray=eog.desktop;
+image/x-icb=eog.desktop;
+image/x-ico=eog.desktop;
+image/x-pcx=eog.desktop;
+image/x-png=eog.desktop;
+image/x-portable-anymap=eog.desktop;
+image/x-portable-bitmap=eog.desktop;
+image/x-portable-graymap=eog.desktop;
+image/x-portable-pixmap=eog.desktop;
+image/x-xbitmap=eog.desktop;
+image/x-xpixmap=eog.desktop;
+image/vnd.wap.wbmp=eog.desktop;
+image/g3fax=gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;
+image/x-fits=gimp.desktop;
+image/x-icon=gimp.desktop;
+image/x-psd=gimp.desktop;
+image/x-sgi=gimp.desktop;
+image/x-sun-raster=gimp.desktop;
+image/x-tga=gimp.desktop;
+image/x-xcf=gimp.desktop;
+image/x-xwindowdump=gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+application/pdf=evince.desktop;
+application/x-bzpdf=evince.desktop;
+application/x-gzpdf=evince.desktop;
+application/postscript=evince.desktop;
+application/x-bzpostscript=evince.desktop;
+application/x-gzpostscript=evince.desktop;
+image/x-eps=evince.desktop;
+image/x-bzeps=evince.desktop;
+image/x-gzeps=evince.desktop;
+application/x-dvi=evince.desktop;
+application/x-bzdvi=evince.desktop;
+application/x-gzdvi=evince.desktop;
+image/vnd.djvu=evince.desktop;
+image/tiff=evince.desktop;
+application/x-cbr=evince.desktop;
+application/x-cbz=evince.desktop;
+application/x-cb7=evince.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
+text/plain=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=org.gnome.gedit.desktop;
+text/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=gedit.destkop
+text/x-php=gedit.destkop
+text/x-python=gedit.destkop
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
+application/javascript=gedit.destkop
+application/x-cgi=org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.gedit.desktop;
+application/x-perl=org.gnome.gedit.desktop;
+application/x-php=org.gnome.gedit.desktop;
+application/x-python=org.gnome.gedit.desktop;
+application/xml=org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.gedit.desktop;
+application/x-font-ttf=org.gnome.font-viewer.desktop;
+application/x-font-pcf=org.gnome.font-viewer.desktop;
+application/x-font-type1=org.gnome.font-viewer.desktop;
+application/x-font-otf=org.gnome.font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-sc=gnumeric.desktop;
+application/x-sylk=gnumeric.desktop;
+application/x-xbase=gnumeric.desktop;
+application/x-xls=gnumeric.desktop;
+application/xls=gnumeric.desktop;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+x-content/audio-player=rhythmbox.desktop;
+x-content/audio-cdda=sound-juicer.desktop;
+application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
+application/mxf=org.gnome.Totem.desktop;
+application/ogg=org.gnome.Totem.desktop;
+application/ram=org.gnome.Totem.desktop;
+application/sdp=org.gnome.Totem.desktop;
+application/smil=org.gnome.Totem.desktop;
+application/smil+xml=org.gnome.Totem.desktop;
+application/vnd.ms-wpl=org.gnome.Totem.desktop;
+application/vnd.rn-realmedia=org.gnome.Totem.desktop;
+application/x-extension-m4a=org.gnome.Totem.desktop;
+application/x-extension-mp4=org.gnome.Totem.desktop;
+application/x-flac=org.gnome.Totem.desktop;
+application/x-flash-video=org.gnome.Totem.desktop;
+application/x-matroska=org.gnome.Totem.desktop;
+application/x-netshow-channel=org.gnome.Totem.desktop;
+application/x-ogg=org.gnome.Totem.desktop;
+application/x-quicktime-media-link=org.gnome.Totem.desktop;
+application/x-quicktimeplayer=org.gnome.Totem.desktop;
+application/x-shorten=org.gnome.Totem.desktop;
+application/x-smil=org.gnome.Totem.desktop;
+application/xspf+xml=org.gnome.Totem.desktop;
+audio/3gpp=org.gnome.Totem.desktop;
+audio/ac3=org.gnome.Totem.desktop;
+audio/AMR=org.gnome.Totem.desktop;
+audio/AMR-WB=org.gnome.Totem.desktop;
+audio/basic=org.gnome.Totem.desktop;
+audio/midi=org.gnome.Totem.desktop;
+audio/mp4=org.gnome.Totem.desktop;
+audio/mpeg=org.gnome.Totem.desktop;
+audio/mpegurl=org.gnome.Totem.desktop;
+audio/ogg=org.gnome.Totem.desktop;
+audio/prs.sid=org.gnome.Totem.desktop;
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
+audio/x-ape=org.gnome.Totem.desktop;
+audio/x-flac=org.gnome.Totem.desktop;
+audio/x-gsm=org.gnome.Totem.desktop;
+audio/x-it=org.gnome.Totem.desktop;
+audio/x-m4a=org.gnome.Totem.desktop;
+audio/x-matroska=org.gnome.Totem.desktop;
+audio/x-mod=org.gnome.Totem.desktop;
+audio/x-mp3=org.gnome.Totem.desktop;
+audio/x-mpeg=org.gnome.Totem.desktop;
+audio/x-mpegurl=org.gnome.Totem.desktop;
+audio/x-ms-asf=org.gnome.Totem.desktop;
+audio/x-ms-asx=org.gnome.Totem.desktop;
+audio/x-ms-wax=org.gnome.Totem.desktop;
+audio/x-ms-wma=org.gnome.Totem.desktop;
+audio/x-musepack=org.gnome.Totem.desktop;
+audio/x-pn-aiff=org.gnome.Totem.desktop;
+audio/x-pn-au=org.gnome.Totem.desktop;
+audio/x-pn-realaudio=org.gnome.Totem.desktop;
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
+audio/x-pn-wav=org.gnome.Totem.desktop;
+audio/x-pn-windows-acm=org.gnome.Totem.desktop;
+audio/x-realaudio=org.gnome.Totem.desktop;
+audio/x-real-audio=org.gnome.Totem.desktop;
+audio/x-sbc=org.gnome.Totem.desktop;
+audio/x-scpls=org.gnome.Totem.desktop;
+audio/x-speex=org.gnome.Totem.desktop;
+audio/x-tta=org.gnome.Totem.desktop;
+audio/x-vorbis=org.gnome.Totem.desktop;
+audio/x-vorbis+ogg=org.gnome.Totem.desktop;
+audio/x-wav=org.gnome.Totem.desktop;
+audio/x-wavpack=org.gnome.Totem.desktop;
+audio/x-xm=org.gnome.Totem.desktop;
+image/vnd.rn-realpix=org.gnome.Totem.desktop;
+image/x-pict=org.gnome.Totem.desktop;
+misc/ultravox=org.gnome.Totem.desktop;
+text/google-video-pointer=org.gnome.Totem.desktop;
+text/x-google-video-pointer=org.gnome.Totem.desktop;
+video/3gpp=org.gnome.Totem.desktop;
+video/dv=org.gnome.Totem.desktop;
+video/fli=org.gnome.Totem.desktop;
+video/flv=org.gnome.Totem.desktop;
+video/mp2t=org.gnome.Totem.desktop;
+video/mp4=org.gnome.Totem.desktop;
+video/mp4v-es=org.gnome.Totem.desktop;
+video/mpeg=org.gnome.Totem.desktop;
+video/msvideo=org.gnome.Totem.desktop;
+video/ogg=org.gnome.Totem.desktop;
+video/quicktime=org.gnome.Totem.desktop;
+video/vivo=org.gnome.Totem.desktop;
+video/vnd.divx=org.gnome.Totem.desktop;
+video/vnd.rn-realvideo=org.gnome.Totem.desktop;
+video/vnd.vivo=org.gnome.Totem.desktop;
+video/webm=org.gnome.Totem.desktop;
+video/x-anim=org.gnome.Totem.desktop;
+video/x-avi=org.gnome.Totem.desktop;
+video/x-flc=org.gnome.Totem.desktop;
+video/x-fli=org.gnome.Totem.desktop;
+video/x-flic=org.gnome.Totem.desktop;
+video/x-flv=org.gnome.Totem.desktop;
+video/x-m4v=org.gnome.Totem.desktop;
+video/x-matroska=org.gnome.Totem.desktop;
+video/x-mpeg=org.gnome.Totem.desktop;
+video/x-ms-asf=org.gnome.Totem.desktop;
+video/x-ms-asx=org.gnome.Totem.desktop;
+video/x-msvideo=org.gnome.Totem.desktop;
+video/x-ms-wm=org.gnome.Totem.desktop;
+video/x-ms-wmv=org.gnome.Totem.desktop;
+video/x-ms-wmx=org.gnome.Totem.desktop;
+video/x-ms-wvx=org.gnome.Totem.desktop;
+video/x-nsv=org.gnome.Totem.desktop;
+video/x-ogm+ogg=org.gnome.Totem.desktop;
+video/x-theora+ogg=org.gnome.Totem.desktop;
+video/x-totem-stream=org.gnome.Totem.desktop;
+x-content/video-dvd=org.gnome.Totem.desktop;
+x-content/video-vcd=org.gnome.Totem.desktop;
+x-content/video-svcd=org.gnome.Totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
new file mode 100644
index 000000000000..905dab2736df
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~leio/distfiles/${P}-xorg-default-translations.patch.xz"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+	>=dev-libs/glib-2.46.0:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.18.0:3
+	>=dev-libs/json-glib-0.10
+	>=gnome-base/gnome-desktop-3.18:3=
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
+
+	media-libs/mesa[egl,gles2]
+
+	media-libs/libepoxy
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo
+
+	systemd? ( >=sys-apps/systemd-183:0= )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.23.2
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	x11-themes/adwaita-icon-theme
+	sys-apps/dbus[X]
+	!systemd? (
+		sys-auth/consolekit
+		>=dev-libs/dbus-glib-0.76
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	>=sys-devel/gettext-0.10.40
+	virtual/pkgconfig
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+	gnome-base/gnome-common
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+PATCHES=(
+	# Restore Xorg as the default GNOME session instead of Wayland for the 3.24 release, bug 641988
+	"${FILESDIR}/3.22.3-xorg-default.patch" # remove ewarn about this below when removing for 3.26; also eautoreconf if possible
+	"${WORKDIR}/${P}-xorg-default-translations.patch"
+)
+
+src_configure() {
+	# 1. Avoid automagic on old upower releases
+	# 2. xsltproc is always checked due to man configure
+	#    switch, even if USE=-doc
+	# 3. Disable old gconf support as other distributions did long time
+	#    ago
+	gnome2_src_configure \
+		--disable-deprecation-flags \
+		--disable-gconf \
+		--enable-session-selector \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd) \
+		$(use_enable !systemd consolekit) \
+		UPOWER_CFLAGS="" \
+		UPOWER_LIBS=""
+		# gnome-session-selector pre-generated man page is missing
+		#$(usex !doc XSLTPROC=$(type -P true))
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# 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() {
+	gnome2_pkg_postinst
+
+	ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
+	ewarn "Wayland for GNOME 3.24 stable version, even if USE=wayland is set on applicable"
+	ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
+	ewarn "desired. GNOME 3.26 will default to Wayland again as upstream GNOME does, if"
+	ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will remain a choice."
+	ewarn "Default enabling USE=wayland via gnome profiles is planned with 3.26 as well."
+
+	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
+}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-base/gnome-session/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>