[gentoo-commits] repo/gentoo:master commit in: mate-base/mate-session-manager/, mate-base/mate-session-manager/files/

2020-04-07 Thread Adam Feldman 
commit: 118c72a585b3dd6db178db38f2938e7048a1a13b
Author: Adam Feldman  gentoo  org>
AuthorDate: Tue Apr  7 18:05:30 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Tue Apr  7 18:31:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118c72a5

mate-base/mate-session-manager: Fix typo and to hopefully be foolproof

Thanks to Joakim Tjerlund for pointing it out.
Bug: https://bugs.gentoo.org/64
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman  gentoo.org>

 .../{10-user-dirs-update-mate-r1 => 10-user-dirs-update-mate-r2}  | 4 +++-
 .../files/{15-xdg-data-mate-r1 => 15-xdg-data-mate-r2}| 4 +++-
 ...manager-1.22.3-r1.ebuild => mate-session-manager-1.22.3-r2.ebuild} | 4 ++--
 ...manager-1.24.0-r1.ebuild => mate-session-manager-1.24.0-r2.ebuild} | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1 
b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
similarity index 65%
rename from mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1
rename to mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
index 994d978dcb3..fd58c0a5b27 100644
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r2
@@ -3,7 +3,9 @@
 # Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
 # That file is read by glib to get XDG_PICTURES_DIR, etc
 
-if [ "$XDG_CURRENT_DESKTOP" = "MATE" ]; then
+if [ "$XDG_CURRENT_DESKTOP" = "MATE" -o \
+   "$XDG_SESSION_DESKTOP" = "mate" -o \
+   "$DESKTOP_SESSION" = "mate" ]; then
if type xdg-user-dirs-update >/dev/null 2>&1; then
xdg-user-dirs-update
fi

diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate-r1 
b/mate-base/mate-session-manager/files/15-xdg-data-mate-r2
similarity index 61%
rename from mate-base/mate-session-manager/files/15-xdg-data-mate-r1
rename to mate-base/mate-session-manager/files/15-xdg-data-mate-r2
index 8bf113e6882..40f2fd13b34 100644
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate-r1
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate-r2
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-if [ "$XDG_DESKTOP_SESSION" = "MATE" ]; then
+if [ "$XDG_CURRENT_DESKTOP" = "MATE" -o \
+   "$XDG_SESSION_DESKTOP" = "mate" -o \
+   "$DESKTOP_SESSION" = "mate" ]; then
if [ -z "$XDG_DATA_DIRS" ]; then
export 
XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
else

diff --git 
a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild 
b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
similarity index 94%
rename from mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
index 9eb1d35adf5..a359dd0028c 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
@@ -83,8 +83,8 @@ src_install() {
 
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
-   newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
+   newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
 
# This should be done in MATE too, see Gentoo bug #270852
-   newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 
10-user-dirs-update-mate
+   newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 
10-user-dirs-update-mate
 }

diff --git 
a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild 
b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
similarity index 94%
rename from mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
index 1788d072af1..3e6f3ca5013 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
@@ -82,8 +82,8 @@ src_install() {
 
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
-   newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
+   newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
 
# This should be done in MATE too, see Gentoo bug #270852
-   newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 
10-user-dirs-update-mate
+   newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 
10-user-dirs-update-mate
 }

[gentoo-commits] repo/gentoo:master commit in: mate-base/mate-session-manager/, mate-base/mate-session-manager/files/

2020-04-06 Thread Adam Feldman 
commit: f37bb35c5790f9f708167bd7d156f3a0c8419836
Author: Adam Feldman  gentoo  org>
AuthorDate: Mon Apr  6 20:06:56 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Mon Apr  6 20:18:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37bb35c

mate-base/mate-session-manager: Fix #64

Closes: https://bugs.gentoo.org/64
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman  gentoo.org>

 .../mate-session-manager/files/10-user-dirs-update-mate-r1 | 10 ++
 mate-base/mate-session-manager/files/15-xdg-data-mate-r1   |  9 +
 ...ger-1.22.3.ebuild => mate-session-manager-1.22.3-r1.ebuild} |  4 ++--
 ...ger-1.24.0.ebuild => mate-session-manager-1.24.0-r1.ebuild} |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1 
b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-r1
new file mode 100644
index 000..994d978dcb3
--- /dev/null
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate-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 [ "$XDG_CURRENT_DESKTOP" = "MATE" ]; then
+   if type xdg-user-dirs-update >/dev/null 2>&1; then
+   xdg-user-dirs-update
+   fi
+fi

diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate-r1 
b/mate-base/mate-session-manager/files/15-xdg-data-mate-r1
new file mode 100644
index 000..8bf113e6882
--- /dev/null
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$XDG_DESKTOP_SESSION" = "MATE" ]; then
+   if [ -z "$XDG_DATA_DIRS" ]; then
+   export 
XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
+   else
+   export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
+   fi
+fi

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3.ebuild 
b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
similarity index 93%
rename from mate-base/mate-session-manager/mate-session-manager-1.22.3.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
index 2d7d629ade7..9eb1d35adf5 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r1.ebuild
@@ -83,8 +83,8 @@ src_install() {
 
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
-   doexe "${FILESDIR}"/15-xdg-data-mate
+   newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
 
# This should be done in MATE too, see Gentoo bug #270852
-   doexe "${FILESDIR}"/10-user-dirs-update-mate
+   newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 
10-user-dirs-update-mate
 }

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild 
b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
similarity index 93%
rename from mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
index f30b9cf5ba1..1788d072af1 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r1.ebuild
@@ -82,8 +82,8 @@ src_install() {
 
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
-   doexe "${FILESDIR}"/15-xdg-data-mate
+   newexe "${FILESDIR}"/15-xdg-data-mate-r1 15-xdg-data-mate
 
# This should be done in MATE too, see Gentoo bug #270852
-   doexe "${FILESDIR}"/10-user-dirs-update-mate
+   newexe "${FILESDIR}"/10-user-dirs-update-mate-r1 
10-user-dirs-update-mate
 }