mate-base/mate-menus: Finish cleaneup of #633334

Bug: 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-menus/files/10-xdg-menu-mate-r1 b/mate-base/mate-menus/files/10-xdg-menu-mate-r1
new file mode 100644 (file)
index 0000000..01a5610
--- /dev/null
+++ b/mate-base/mate-menus/files/10-xdg-menu-mate-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && \
+       [ "$XDG_CURRENT_DESKTOP" = "MATE" -o \
+       "$XDG_SESSION_DESKTOP" = "mate" -o \
+       "$DESKTOP_SESSION" = "mate" ]
+then
+       export XDG_MENU_PREFIX=mate-
+fi

diff --git a/mate-base/mate-menus/mate-menus-1.22.1.ebuild b/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
similarity index 93%
rename from mate-base/mate-menus/mate-menus-1.22.1.ebuild
rename to mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
index c93dbf13c79cdcd7ab0d78b7e02a998d02cec6d9..aa489e3e46e190b7b18c5162e8117d6cbd17e05b 100644 (file)
--- a/mate-base/mate-menus/mate-menus-1.22.1.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
@@ -40,5 +40,5 @@ src_install() {
        mate_src_install
 
        exeinto /etc/X11/xinit/xinitrc.d/
-       doexe "${FILESDIR}/10-xdg-menu-mate"
+       newexe "${FILESDIR}/10-xdg-menu-mate-r1" "10-xdg-menu-mate"
 }

diff --git a/mate-base/mate-menus/mate-menus-1.24.0.ebuild b/mate-base/mate-menus/mate-menus-1.24.0-r1.ebuild
similarity index 93%
rename from mate-base/mate-menus/mate-menus-1.24.0.ebuild
rename to mate-base/mate-menus/mate-menus-1.24.0-r1.ebuild
index e927b3f8c6dac6fcbd2de63ac22d2ac20e8bec03..e0a404983b3491ab9f3b023864b3a6475cf38998 100644 (file)
--- a/mate-base/mate-menus/mate-menus-1.24.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.24.0-r1.ebuild
@@ -38,5 +38,5 @@ src_install() {
        mate_src_install
 
        exeinto /etc/X11/xinit/xinitrc.d/
-       doexe "${FILESDIR}/10-xdg-menu-mate"
+       newexe "${FILESDIR}/10-xdg-menu-mate-r1" "10-xdg-menu-mate"
 }