commit: c9212800c9d3ecbcca2150dd68fc57c4b85fd29a Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon May 31 05:26:28 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon May 31 05:41:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9212800
app-editors/emacs: Clean up cleanup in src_install Upstream doesn't install /usr/share/appdata since some time. Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/emacs-26.3-r4.ebuild | 2 +- app-editors/emacs/emacs-27.1-r4.ebuild | 2 +- app-editors/emacs/emacs-27.2.9999.ebuild | 2 +- app-editors/emacs/emacs-27.2.ebuild | 2 +- app-editors/emacs/emacs-28.0.9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild index fe5c125a481..17aae4994de 100644 --- a/app-editors/emacs/emacs-26.3-r4.ebuild +++ b/app-editors/emacs/emacs-26.3-r4.ebuild @@ -262,7 +262,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild index 86cf0e3326d..e465593dcfc 100644 --- a/app-editors/emacs/emacs-27.1-r4.ebuild +++ b/app-editors/emacs/emacs-27.1-r4.ebuild @@ -326,7 +326,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild index 1efba0ded78..7089e4a9a73 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2.9999.ebuild @@ -325,7 +325,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild index 4c0d1595de9..e8a61860e0c 100644 --- a/app-editors/emacs/emacs-27.2.ebuild +++ b/app-editors/emacs/emacs-27.2.ebuild @@ -325,7 +325,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 67f83fec1f1..aeefea10ed8 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -315,7 +315,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die