summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Feldman <NP-Hardass@gentoo.org>2020-04-07 14:49:40 -0400
committerAdam Feldman <NP-Hardass@gentoo.org>2020-04-07 14:50:43 -0400
commit3f397745b83622b8029220a85e32601ca9d16eb6 (patch)
treed576b2fc931fa8eee3ddf5707ab906ad85aafe3d /mate-base/mate-menus
parentdev-ml/num: use ocamlopt (diff)
downloadgentoo-3f397745b83622b8029220a85e32601ca9d16eb6.tar.gz
gentoo-3f397745b83622b8029220a85e32601ca9d16eb6.tar.bz2
gentoo-3f397745b83622b8029220a85e32601ca9d16eb6.zip
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>
Diffstat (limited to 'mate-base/mate-menus')
-rw-r--r--mate-base/mate-menus/files/10-xdg-menu-mate-r19
-rw-r--r--mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild (renamed from mate-base/mate-menus/mate-menus-1.22.1.ebuild)2
-rw-r--r--mate-base/mate-menus/mate-menus-1.24.0-r1.ebuild (renamed from mate-base/mate-menus/mate-menus-1.24.0.ebuild)2
3 files changed, 11 insertions, 2 deletions
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
index 00000000000..01a5610c085
--- /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
index c93dbf13c79..aa489e3e46e 100644
--- 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
index e927b3f8c6d..e0a404983b3 100644
--- 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"
}