[gentoo-commits] proj/musl:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/

[gentoo-commits] proj/musl:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/

[Anthony G. Basile]

commit:     f0aebab06888c44934608f7b5eca40d8b47c3f60
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Tue Sep  5 05:50:00 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 13:39:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=f0aebab0

gnome-base/gnome-session: revbump, untested due to systemd dependencies

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 gnome-base/gnome-session/Manifest                  |   7 +-
 .../files/3.22.3-wayland-login-shell.patch         |  43 ++
 .../files/3.22.3-xorg-default-translations.patch   | 619 +++++++++++++++++++++
 .../gnome-session/files/3.22.3-xorg-default.patch  |  58 ++
 ...n-3.20.2.ebuild => gnome-session-3.22.3.ebuild} |  30 +-
 5 files changed, 746 insertions(+), 11 deletions(-)

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index e450e12..9ed26be 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,9 +1,12 @@
 AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6
 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e
+AUX 3.22.3-wayland-login-shell.patch 1253 SHA256 c45a23e9b1673e79df07f586f9f4e4a276f2b399b62c2610d38577f20dc95e46 SHA512 3abcdf697b3d1160b37031232e223759e24aff23b97dd1b8e4f1347071bf1575832ac00eae0414d2b9839636b85aaceb028bfbc2e488e38ff5fd17d3497a1b6e WHIRLPOOL 7edfbe43ed9499dc5da71509620ff6991f69f93dcb112d5002f4b760ea19b7f9ee7dc197fcf95b55fc013b599c2cecc615ed4dbe3f8cae416adedea4ea879764
+AUX 3.22.3-xorg-default-translations.patch 15908 SHA256 83362800086601b9f60024c1f455f0123f05475862de2ca7b88d5c76c75ae5d2 SHA512 e71b0dc296b4fd43b6bdc2251d8f1d9eb9d5f5e369100e66427254038de7e2e8e6cc8fed3173a618cf1a2677dc4346c1061a99926f3d8e2f40e2789d4f32f7a3 WHIRLPOOL 7b85589c2e4c6cd2e74bc5f3e75c8c6149b23c8ce29c4e0db1190c180be004ac7a52b8bd1af26f3d526eff7ba9e80eda1174ee5bde8f2344e3bb83395eaeddfd
+AUX 3.22.3-xorg-default.patch 1929 SHA256 7142210207012fa8669a84fc78ab1b5a1db9f7e0d632291fd49b3118ef5f89bc SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1 WHIRLPOOL 864a8403069bf9c55c3d79fc780ad90cec4c4637ba8dc0b91b0680f011563e567b6287054b53fd9bb2b5f52c750c97f70dd70fe0a238963eb80fac34172586d4
 AUX 90-xcursor-theme-gnome 384 SHA256 e54babb8c0d0ad33eaa0f80985c802b0656fad9d1d60df2f1aa979f38356d8e0 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b WHIRLPOOL 68bc6c55d6a10cd14539eae6cc34f746c2bc485f96112317213f89c579a9ae7b259c0969155e2c8b30e88d62e19196bcdec559bb2cf3a3816034957c1fa5997e
 AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0
 AUX defaults.list-r3 18178 SHA256 85c225ec5fe9c4e0d337ce003441cc419f54259a46122128cfd958a7bfd2b45b SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3 WHIRLPOOL f07aa9c1390a217b53a49038b0a631da347b5e937f8c7ea1c56d83af4a5c5e1b32d0cb30d75d881b2af0e8e5711bc7907f916976a3c816a5909f2087a8341b38
 AUX patch-gnome-session_main_c.patch 538 SHA256 9c621b5bd9bffa07a0cb3eefa1826757d92422efb3a83c7061f78ff3b8052f0e SHA512 f4941f47868baf05d665bc2b67d27e417ac251c6211cc66e68a4dd2b035804d6333929592e5c40b1610ab1f8e393006aed956afdc29c430524132e7ced32d055 WHIRLPOOL e8593d3e71a664c82f61521bbe7e594cb9a1741e9805e4a194be6afa3f0f389349e23ed71f9f90a15fb0a445dacc6a6795fecab753d8245feeebdff94cbb3eb1
-DIST gnome-session-3.20.2.tar.xz 785952 SHA256 025f97e0b9f5431890598d6130040e1e7071771cc29e1d29d8e2e7c84d95f6da SHA512 0973c9763195a79038d99139f56eff8d7ad1fccc4c4e41a6439b5c65c615059a21446545af70f4ed83ec6925fd61a7664e70eec844dfe5e2a1001dffdbbea13a WHIRLPOOL 4a3cf1580b966a0b617e78db45635ec66d7bdfb6d5b183390edb07aaae3911876ff4af774cb0ae93c6ee4316555303812fcff40efce1827946457cb2a0646f61
-EBUILD gnome-session-3.20.2.ebuild 3610 SHA256 aa5d07e82e91b74ec622631b5f4619d90653ceba404e244df125f0bee610b521 SHA512 e84c0688aaf6964d232c592c927f9a0c4effba2afc9c09d029e7c92966a0ec5651b6e9832f5dcec930c8c38396c219dae2a6015ab8526cecfdf289abf9569600 WHIRLPOOL 1c4b55827002d7091acbed7b94f12d5e016143dd46e00c58a86daf602888031cf92a87a31698e81b3dbe9ded72b5163a88e4afb42b42a07cc7a2cf99b4b81661
+DIST gnome-session-3.22.3.tar.xz 777420 SHA256 cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd WHIRLPOOL 35e78d60b16ee9027d2c664f2a222a48083736e032e1be41fd015403fb8e9dcf4b2560299b1c9c9e81bde95cb9ed86da41ed0cc44a816f71e83a1a4e1a704fb9
+EBUILD gnome-session-3.22.3.ebuild 4488 SHA256 5e4ad1c2b6c597d8b51986619ab4629c492189df605c83f30b377b28d8c6404c SHA512 c0dce1b53b7a083ae1215e2152f2fc8557606c38b3c40af187e95d136b4ad69e34a3b8d7e161480f6995044338464d6014bd61d470b436caf563e63ae5ae3f15 WHIRLPOOL 4b6299b8b5bd30f52d7582672cd4aed1006d3424a49ac32509744bd7c3c19fafdba285a4c00c58fd1d20bd6f1043ae81c1cd0976553a5d3a0f675d570fbe953c
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92

diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
new file mode 100644
index 0000000..f82825f
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
@@ -0,0 +1,43 @@
+From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 5 Jan 2017 10:02:58 -0500
+Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login
+ shell
+
+Users expect their shell profiles to get sourced at startup, which
+doesn't happen with wayland sessions.
+
+This commit brings back that feature, by making the gnome-session
+wrapper script run a login shell.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=736660
+---
+ gnome-session/gnome-session.in | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index 530299d..04ea741 100644
+--- a/gnome-session/gnome-session.in
++++ b/gnome-session/gnome-session.in
+@@ -1,5 +1,18 @@
+ #!/bin/sh
+ 
++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
++   [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
++   [  -n "$SHELL" ] &&
++   grep -q "$SHELL" /etc/shells &&
++   ! (echo "$SHELL" | grep -q "false") &&
++   ! (echo "$SHELL" | grep -q "nologin"); then
++  if [ "$1" != '-l' ]; then
++    exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
++  else
++    shift
++  fi
++fi
++
+ SETTING=$(gsettings get org.gnome.system.locale region)
+ REGION=${SETTING#\'}
+ REGION=${REGION%\'}
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
new file mode 100644
index 0000000..8c259de
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
@@ -0,0 +1,619 @@
+From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 18 Mar 2017 11:42:40 +0200
+Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations
+
+---
+ po/POTFILES.in | 2 +-
+ po/bg.po       | 4 ++++
+ po/cs.po       | 4 ++++
+ po/da.po       | 4 ++++
+ po/de.po       | 4 ++++
+ po/el.po       | 4 ++++
+ po/es.po       | 4 ++++
+ po/eu.po       | 4 ++++
+ po/fa.po       | 4 ++++
+ po/fi.po       | 4 ++++
+ po/fr.po       | 4 ++++
+ po/fur.po      | 4 ++++
+ po/gd.po       | 4 ++++
+ po/gl.po       | 4 ++++
+ po/gu.po       | 4 ++++
+ po/he.po       | 4 ++++
+ po/hr.po       | 4 ++++
+ po/hu.po       | 4 ++++
+ po/id.po       | 4 ++++
+ po/is.po       | 4 ++++
+ po/it.po       | 4 ++++
+ po/kk.po       | 4 ++++
+ po/ko.po       | 4 ++++
+ po/lt.po       | 4 ++++
+ po/lv.po       | 4 ++++
+ po/nb.po       | 4 ++++
+ po/pl.po       | 4 ++++
+ po/pt.po       | 4 ++++
+ po/pt_BR.po    | 4 ++++
+ po/ru.po       | 4 ++++
+ po/sk.po       | 4 ++++
+ po/sr.po       | 4 ++++
+ po/sr@latin.po | 4 ++++
+ po/sv.po       | 4 ++++
+ po/tr.po       | 4 ++++
+ po/uk.po       | 4 ++++
+ po/vi.po       | 4 ++++
+ po/zh_CN.po    | 4 ++++
+ 38 files changed, 149 insertions(+), 1 deletion(-)
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index cc1170a..0feb5cf 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -2,9 +2,9 @@
+ # Please keep this file sorted alphabetically.
+ data/gnome-custom-session.desktop.in
+ data/gnome.desktop.in
+-data/gnome-xorg.desktop.in
+ data/gnome-dummy.session.desktop.in.in
+ data/gnome.session.desktop.in.in
++data/gnome-wayland.desktop.in
+ [type: gettext/glade]data/session-selector.ui
+ gnome-session/gsm-fail-whale-dialog.c
+ gnome-session/gsm-manager.c
+diff --git a/po/bg.po b/po/bg.po
+index 7d243fc..7bb73b6 100644
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME — фиктивна"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME с Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Друга сесия"
+diff --git a/po/cs.po b/po/cs.po
+index a9acc59..4efd144 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME na Waylandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Vlastní sezení"
+diff --git a/po/da.po b/po/da.po
+index de709ac..62a49c3 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME-attrap"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME på Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Tilpasset session"
+diff --git a/po/de.po b/po/de.po
+index 051c9ee..a283114 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME Platzhalter"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME unter Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Benutzerdefinierte Sitzung"
+diff --git a/po/el.po b/po/el.po
+index 99f92ba..9f1d419 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg"
+ msgid "GNOME dummy"
+ msgstr "Εικονικό GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME σε Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Προσαρμοσμένη συνεδρία"
+diff --git a/po/es.po b/po/es.po
+index 79e3a6d..a9b73b2 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME «dummy»"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME en Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesión personalizada"
+diff --git a/po/eu.po b/po/eu.po
+index da3969d..6b57df1 100644
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean"
+ msgid "GNOME dummy"
+ msgstr "Probako GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland gainean"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Saio pertsonalizatua"
+diff --git a/po/fa.po b/po/fa.po
+index 1737204..8b1b6e5 100644
+--- a/po/fa.po
++++ b/po/fa.po
+@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg"
+ msgid "GNOME dummy"
+ msgstr "گنوم ساختگی"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "گنوم بر روی Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "نشست سفارشی"
+diff --git a/po/fi.po b/po/fi.po
+index a3cd0ca..8b5025c 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen"
+ msgid "GNOME dummy"
+ msgstr "Gnome-malli-istunto (dummy)"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Gnome Waylandia käyttäen"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Omavalintainen istunto"
+diff --git a/po/fr.po b/po/fr.po
+index e209804..5fe647a 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME factice"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME sur Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Session personnalisée"
+diff --git a/po/fur.po b/po/fur.po
+index 8245a6f..1dc5f85 100644
+--- a/po/fur.po
++++ b/po/fur.po
+@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME su Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Session personalizade"
+diff --git a/po/gd.po b/po/gd.po
+index beb1618..ebb67bc 100644
+--- a/po/gd.po
++++ b/po/gd.po
+@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg"
+ msgid "GNOME dummy"
+ msgstr "Caochag GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME air Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Seisean gnàthaichte"
+diff --git a/po/gl.po b/po/gl.po
+index 02b9879..2d9c944 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME de proba"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME en Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesión personalizada"
+diff --git a/po/gu.po b/po/gu.po
+index c83ed6b..fa92f6a 100644
+--- a/po/gu.po
++++ b/po/gu.po
+@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME ડમી"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland પર GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "વૈવિધ્ય સત્ર"
+diff --git a/po/he.po b/po/he.po
+index 22045b6..c197658 100644
+--- a/po/he.po
++++ b/po/he.po
+@@ -45,6 +45,10 @@ msgstr "‏GNOME על גבי Xorg"
+ msgid "GNOME dummy"
+ msgstr "מדומה של GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "‏GNOME על גבי Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "הפעלה מותאמת אישית"
+diff --git a/po/hr.po b/po/hr.po
+index db64d1a..46ba1af 100644
+--- a/po/hr.po
++++ b/po/hr.po
+@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu"
+ msgid "GNOME dummy"
+ msgstr "GNOME lažno"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME na Waylandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Prilagođena sesija"
+diff --git a/po/hu.po b/po/hu.po
+index 403b0a1..f207056 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon"
+ msgid "GNOME dummy"
+ msgstr "GNOME példa"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland-en"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Egyéni környezet"
+diff --git a/po/id.po b/po/id.po
+index 04848d8..3519b35 100644
+--- a/po/id.po
++++ b/po/id.po
+@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME pada Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesi Gubahan"
+diff --git a/po/is.po b/po/is.po
+index 5cfbfa2..a95c1e7 100644
+--- a/po/is.po
++++ b/po/is.po
+@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME sýnishorn"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME á Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sérsniðin seta"
+diff --git a/po/it.po b/po/it.po
+index 3a95eff..6119ff2 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME su Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessione personalizzata"
+diff --git a/po/kk.po b/po/kk.po
+index 7168f0d..8fede72 100644
+--- a/po/kk.po
++++ b/po/kk.po
+@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME жалған сессиясы"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland негізіндегі GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Таңдауыңызша сесия"
+diff --git a/po/ko.po b/po/ko.po
+index 8c90323..359a65d 100644
+--- a/po/ko.po
++++ b/po/ko.po
+@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)"
+ msgid "GNOME dummy"
+ msgstr "그놈 더미"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "그놈, 웨일랜드"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "사용자 지정 세션"
+diff --git a/po/lt.po b/po/lt.po
+index 9a4bfb9..221c293 100644
+--- a/po/lt.po
++++ b/po/lt.po
+@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje"
+ msgid "GNOME dummy"
+ msgstr "GNOME netikra"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland aplinkoje"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Pasirinktinis seansas"
+diff --git a/po/lv.po b/po/lv.po
+index 14e4180..688efe2 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME makets"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME ar Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Pielāgota sesija"
+diff --git a/po/nb.po b/po/nb.po
+index afad648..471fb14 100644
+--- a/po/nb.po
++++ b/po/nb.po
+@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME på Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Egendefinert økt"
+diff --git a/po/pl.po b/po/pl.po
+index 92b0cfe..1b92056 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)"
+ msgid "GNOME dummy"
+ msgstr "Pusta sesja GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME (Wayland)"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Niestandardowa sesja"
+diff --git a/po/pt.po b/po/pt.po
+index fc4bb99..573908d 100644
+--- a/po/pt.po
++++ b/po/pt.po
+@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME de teste"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME no Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessão personalizada"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 6a2a88a..7d6a66a 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME experimental"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME sobre Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessão personalizada"
+diff --git a/po/ru.po b/po/ru.po
+index 4378126..52eda37 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg"
+ msgid "GNOME dummy"
+ msgstr "Фиктивный сеанс GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME на Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Другой сеанс"
+diff --git a/po/sk.po b/po/sk.po
+index 0f75b10..49fbf5d 100644
+--- a/po/sk.po
++++ b/po/sk.po
+@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg"
+ msgid "GNOME dummy"
+ msgstr "Fingované GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME cez Wayland"
++
+ # GtkWindow title
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+diff --git a/po/sr.po b/po/sr.po
+index 7ec002a..2a71f45 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу"
+ msgid "GNOME dummy"
+ msgstr "Гномов лажњак"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Гном на Вејланду"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Прилагођена сесија"
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index 677444e..b148d70 100644
+--- a/po/sr@latin.po
++++ b/po/sr@latin.po
+@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru"
+ msgid "GNOME dummy"
+ msgstr "Gnomov lažnjak"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Gnom na Vejlandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Prilagođena sesija"
+diff --git a/po/sv.po b/po/sv.po
+index 2894eec..3072075 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME-attrapp"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME med Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Anpassad session"
+diff --git a/po/tr.po b/po/tr.po
+index 3ede169..87bba43 100644
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland üzerinde GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Özel Oturum"
+diff --git a/po/uk.po b/po/uk.po
+index de980dc..c98fd8d 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg"
+ msgid "GNOME dummy"
+ msgstr "Несправжній GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME через Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Власний сеанс"
+diff --git a/po/vi.po b/po/vi.po
+index 1cdee0a..cf249e3 100644
+--- a/po/vi.po
++++ b/po/vi.po
+@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg"
+ msgid "GNOME dummy"
+ msgstr "Giả lập GNOME"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME trên Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Phiên làm việc tự chọn"
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 6f07716..8d36444 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+ 
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "基于 Wayland 的 GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "自定义会话"
+-- 
+2.10.1
+

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 0000000..02eea39
--- /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/gnome-session-3.20.2.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
similarity index 75%
rename from gnome-base/gnome-session/gnome-session-3.20.2.ebuild
rename to gnome-base/gnome-session/gnome-session-3.22.3.ebuild
index df3f7a3..0c315ca 100644
--- a/gnome-base/gnome-session/gnome-session-3.20.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+GNOME2_EAUTORECONF="yes"
 inherit gnome2
 
 DESCRIPTION="Gnome session manager"
@@ -9,7 +10,7 @@ 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 ~amd64-linux ~x86-linux ~x86-solaris"
+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
@@ -24,7 +25,9 @@ COMMON_DEPEND="
 	>=gnome-base/gnome-desktop-3.18:3=
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
-	virtual/opengl
+	media-libs/mesa[egl,gles2]
+
+	media-libs/libepoxy
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libXau
@@ -54,24 +57,27 @@ 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
+	>=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
 "
-PATCHES=( "${FILESDIR}"/patch-gnome-session_main_c.patch )
-
 # gnome-common needed for eautoreconf
 # gnome-base/gdm does not provide gnome.desktop anymore
 
-src_prepare() {
-	default
-}
+PATCHES=(
+	# Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110
+	"${FILESDIR}/${PV}-wayland-login-shell.patch"
+	# Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146
+	"${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24
+	"${FILESDIR}/${PV}-xorg-default-translations.patch"
+	"${FILESDIR}/patch-gnome-session_main_c.patch"
+)
 
 src_configure() {
 	# 1. Avoid automagic on old upower releases
@@ -119,6 +125,12 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
+	ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
+	ewarn "Wayland for GNOME 3.22 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.24 will default to Wayland again as upstream GNOME does, if"
+	ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice."
+
 	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."