summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-11-24 18:47:14 +0100
committerUlrich Müller <ulm@gentoo.org>2020-11-24 19:26:11 +0100
commit9065b61ede19d25b8d8c505660eeec8a8a32dbab (patch)
treed10cb8354032f890f1c33ee31d84894bafa61c70
parentnet-wireless/gr-osmosdr: upstream removed miri (diff)
downloadgentoo-9065b61ede19d25b8d8c505660eeec8a8a32dbab.tar.gz
gentoo-9065b61ede19d25b8d8c505660eeec8a8a32dbab.tar.bz2
gentoo-9065b61ede19d25b8d8c505660eeec8a8a32dbab.zip
app-editors/emacs: Partially revert "Test for existence of movemail."
movemail is being installed unconditionally in slots 23, 24, and 25. This partially reverts commit bb919372bc35394f77f96f7f12b6b41f5e4db2e9. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--app-editors/emacs/emacs-23.4-r20.ebuild6
-rw-r--r--app-editors/emacs/emacs-24.5-r9.ebuild6
-rw-r--r--app-editors/emacs/emacs-25.3-r8.ebuild6
3 files changed, 6 insertions, 12 deletions
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index b7f1af2f8588..7817b1255749 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -251,10 +251,8 @@ src_install() {
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
- if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild
index bb8e21aeaa36..d205fe64db89 100644
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -244,10 +244,8 @@ src_install() {
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
- if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild
index dbd8a8b54a6e..2deef88cebcf 100644
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -253,10 +253,8 @@ src_install() {
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
- if [[ -f ${ED}/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail ]]; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el