[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     9065b61ede19d25b8d8c505660eeec8a8a32dbab
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 17:47:14 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 18:26:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9065b61e

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 <AT> gentoo.org>

 app-editors/emacs/emacs-23.4-r20.ebuild | 6 ++----
 app-editors/emacs/emacs-24.5-r9.ebuild  | 6 ++----
 app-editors/emacs/emacs-25.3-r8.ebuild  | 6 ++----
 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 b7f1af2f858..7817b125574 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 bb8e21aeaa3..d205fe64db8 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 dbd8a8b54a6..2deef88cebc 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