diff options
Diffstat (limited to 'app-editors/emacs/emacs-26.3-r13.ebuild')
| -rw-r--r-- | app-editors/emacs/emacs-26.3-r13.ebuild | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app-editors/emacs/emacs-26.3-r13.ebuild b/app-editors/emacs/emacs-26.3-r13.ebuild index 10482650084c..908d736cf0d5 100644 --- a/app-editors/emacs/emacs-26.3-r13.ebuild +++ b/app-editors/emacs/emacs-26.3-r13.ebuild @@ -249,10 +249,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # 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 if ! use mailutils; then @@ -350,10 +349,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() { |