| 1 |
commit: c9212800c9d3ecbcca2150dd68fc57c4b85fd29a |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 31 05:26:28 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 31 05:41:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9212800 |
| 7 |
|
| 8 |
app-editors/emacs: Clean up cleanup in src_install |
| 9 |
|
| 10 |
Upstream doesn't install /usr/share/appdata since some time. |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-editors/emacs/emacs-26.3-r4.ebuild | 2 +- |
| 16 |
app-editors/emacs/emacs-27.1-r4.ebuild | 2 +- |
| 17 |
app-editors/emacs/emacs-27.2.9999.ebuild | 2 +- |
| 18 |
app-editors/emacs/emacs-27.2.ebuild | 2 +- |
| 19 |
app-editors/emacs/emacs-28.0.9999.ebuild | 2 +- |
| 20 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild |
| 23 |
index fe5c125a481..17aae4994de 100644 |
| 24 |
--- a/app-editors/emacs/emacs-26.3-r4.ebuild |
| 25 |
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild |
| 26 |
@@ -262,7 +262,7 @@ src_install() { |
| 27 |
|
| 28 |
# avoid collision between slots, see bug #169033 e.g. |
| 29 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 30 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 31 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 32 |
rm -rf "${ED}/usr/$(get_libdir)" || die |
| 33 |
rm -rf "${ED}"/var || die |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild |
| 37 |
index 86cf0e3326d..e465593dcfc 100644 |
| 38 |
--- a/app-editors/emacs/emacs-27.1-r4.ebuild |
| 39 |
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild |
| 40 |
@@ -326,7 +326,7 @@ src_install() { |
| 41 |
|
| 42 |
# avoid collision between slots, see bug #169033 e.g. |
| 43 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 44 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 45 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 46 |
rm -rf "${ED}/usr/$(get_libdir)" || die |
| 47 |
rm -rf "${ED}"/var || die |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 51 |
index 1efba0ded78..7089e4a9a73 100644 |
| 52 |
--- a/app-editors/emacs/emacs-27.2.9999.ebuild |
| 53 |
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 54 |
@@ -325,7 +325,7 @@ src_install() { |
| 55 |
|
| 56 |
# avoid collision between slots, see bug #169033 e.g. |
| 57 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 58 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 59 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 60 |
rm -rf "${ED}/usr/$(get_libdir)" || die |
| 61 |
rm -rf "${ED}"/var || die |
| 62 |
|
| 63 |
|
| 64 |
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild |
| 65 |
index 4c0d1595de9..e8a61860e0c 100644 |
| 66 |
--- a/app-editors/emacs/emacs-27.2.ebuild |
| 67 |
+++ b/app-editors/emacs/emacs-27.2.ebuild |
| 68 |
@@ -325,7 +325,7 @@ src_install() { |
| 69 |
|
| 70 |
# avoid collision between slots, see bug #169033 e.g. |
| 71 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 72 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 73 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 74 |
rm -rf "${ED}/usr/$(get_libdir)" || die |
| 75 |
rm -rf "${ED}"/var || die |
| 76 |
|
| 77 |
|
| 78 |
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 79 |
index 67f83fec1f1..aeefea10ed8 100644 |
| 80 |
--- a/app-editors/emacs/emacs-28.0.9999.ebuild |
| 81 |
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 82 |
@@ -315,7 +315,7 @@ src_install() { |
| 83 |
|
| 84 |
# avoid collision between slots, see bug #169033 e.g. |
| 85 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 86 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 87 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 88 |
rm -rf "${ED}/usr/$(get_libdir)/systemd" || die |
| 89 |
rm -rf "${ED}"/var || die |
Archives