diff options
Diffstat (limited to 'app-editors/emacs/emacs-25.3-r16.ebuild')
| -rw-r--r-- | app-editors/emacs/emacs-25.3-r16.ebuild | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app-editors/emacs/emacs-25.3-r16.ebuild b/app-editors/emacs/emacs-25.3-r16.ebuild index 1e7a6cd64d8b..c30c446b5c38 100644 --- a/app-editors/emacs/emacs-25.3-r16.ebuild +++ b/app-editors/emacs/emacs-25.3-r16.ebuild @@ -240,11 +240,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ || die "moving emacs man page failed" - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail @@ -330,10 +328,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { |