commit: bb919372bc35394f77f96f7f12b6b41f5e4db2e9 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 24 16:02:14 2020 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Nov 24 16:06:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb919372
app-editors/emacs: Test for existence of movemail. Fixes: 69c62ad248ca78ed2bb1833cae1ac20f63e9a0be Closes: https://bugs.gentoo.org/756352 Package-Manager: Portage-3.0.10, Repoman-3.0.2 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 ++++-- app-editors/emacs/emacs-26.3-r3.ebuild | 6 ++++-- app-editors/emacs/emacs-27.1-r2.ebuild | 6 ++++-- app-editors/emacs/emacs-27.1.9999-r1.ebuild | 6 ++++-- app-editors/emacs/emacs-28.0.9999.ebuild | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild index 7817b125574..b7f1af2f858 100644 --- a/app-editors/emacs/emacs-23.4-r20.ebuild +++ b/app-editors/emacs/emacs-23.4-r20.ebuild @@ -251,8 +251,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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 d205fe64db8..bb8e21aeaa3 100644 --- a/app-editors/emacs/emacs-24.5-r9.ebuild +++ b/app-editors/emacs/emacs-24.5-r9.ebuild @@ -244,8 +244,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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 2deef88cebc..dbd8a8b54a6 100644 --- a/app-editors/emacs/emacs-25.3-r8.ebuild +++ b/app-editors/emacs/emacs-25.3-r8.ebuild @@ -253,8 +253,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild index aac4c052730..187d13793f7 100644 --- a/app-editors/emacs/emacs-26.3-r3.ebuild +++ b/app-editors/emacs/emacs-26.3-r3.ebuild @@ -269,8 +269,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild index 3023726c93b..e297c44f313 100644 --- a/app-editors/emacs/emacs-27.1-r2.ebuild +++ b/app-editors/emacs/emacs-27.1-r2.ebuild @@ -312,8 +312,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index d9bf716c2cb..60faa71894c 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -311,8 +311,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # 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-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 092c0181e57..79d4c689e4b 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -310,8 +310,10 @@ src_install() { docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + 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 # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
