From: Adam Feldman <NP-Hardass@gentoo.org>
Date: Mon, 6 Apr 2020 20:06:56 +0000 (-0400)
Subject: mate-base/mate-session-manager: Fix #633334
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f37bb35c5790f9f708167bd7d156f3a0c8419836;p=gentoo.git

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

Closes: https://bugs.gentoo.org/633334
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
---

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 000000000000..994d978dcb3d
--- /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 000000000000..8bf113e6882c
--- /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 2d7d629ade73..9eb1d35adf53 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 f30b9cf5ba10..1788d072af18 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
 }