commit: 3f397745b83622b8029220a85e32601ca9d16eb6 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Tue Apr 7 18:49:40 2020 +0000 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> CommitDate: Tue Apr 7 18:50:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f397745
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 <AT> gentoo.org> mate-base/mate-menus/files/10-xdg-menu-mate-r1 | 9 +++++++++ .../{mate-menus-1.22.1.ebuild => mate-menus-1.22.1-r1.ebuild} | 2 +- .../{mate-menus-1.24.0.ebuild => mate-menus-1.24.0-r1.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 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 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 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 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" }
