gentoo resync : 04.07.2020

3 files changed, 32 insertions, 32 deletions

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 0d630542b1e2..a27e7f1b1e0f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
-AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783fb568368b540cf1dfb2f9f888b3131238abac70e970081e59fed74e19f2380729c7f3de2b4 SHA512 f1f9264ef6103e66ced2d94bdb24dafb71a37ed8286b35536fa992d774f288bb9b8e338e184c955b39f0448da91af5d7c2d12c5536521186d8ee5db832e20e7e
+AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
+EBUILD lightdm-1.30.0-r1.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
index 50ce80fd3e19..1fe0110c9d9b 100644
--- a/x11-misc/lightdm/files/Xsession
+++ b/x11-misc/lightdm/files/Xsession
@@ -5,36 +5,36 @@
 echo "Running X session wrapper"
 
 # Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
-    if [ -f "$file" ]; then
-        echo "Loading profile from $file";
-        . "$file"
+for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading profile from ${file}";
+        . "${file}"
     fi
 done
 
 # Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
-    if [ -f "$file" ]; then
-        echo "Loading resource: $file"
-        xrdb -nocpp -merge "$file"
+for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading resource: ${file}"
+        xrdb -nocpp -merge "${file}"
     fi
 done
 
 # Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
-    if [ -f "$file" ]; then
-        echo "Loading keymap: $file"
-        setxkbmap `cat "$file"`
+for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading keymap: ${file}"
+        setxkbmap $(cat "${file}")
         XKB_IN_USE=yes
     fi
 done
 
 # Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
-    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
-        if [ -f "$file" ]; then
-           echo "Loading modmap: $file"
-           xmodmap "$file"
+if [ -z "${XKB_IN_USE}" ] ; then
+    for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do
+        if [ -f "${file}" ] ; then
+           echo "Loading modmap: ${file}"
+           xmodmap "${file}"
         fi
     done
 fi
@@ -48,27 +48,27 @@ command="$@"
 
 # Run all system xinitrc shell scripts.
 xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
-    for script in $xinitdir/*; do
-        echo "Loading xinit script $script"
-        if [ -x "$script" -a ! -d "$script" ]; then
-            . "$script"
+if [ -d "${xinitdir}" ] ; then
+    for script in ${xinitdir}/* ; do
+        if [ -x "${script}" ] && [ ! -d "${script}" ] ; then
+            echo "Loading xinit script ${script}"
+            . "${script}"
         fi
     done
 fi
 
 # Load Xsession scripts
 xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
-    for i in `ls $xsessionddir`; do
-        script="$xsessionddir/$i"
-        echo "Loading X session script $script"
-        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-            . "$script"
+if [ -d "${xsessionddir}" ] ; then
+    for i in $(ls ${xsessionddir}) ; do
+        script="${xsessionddir}/${i}"
+        if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then
+            echo "Loading X session script ${script}"
+            . "${script}"
         fi
     done
 fi
 
-echo "X session wrapper complete, running session $@"
+echo "X session wrapper complete, running session ${@}"
 
-exec $command
+exec ${command}
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
index ea3868227341..ea3868227341 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild