diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-05 23:52:45 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-05 23:52:45 +0000 |
commit | 1c33e521c460dc40899ce7bc919602b842ce27e2 (patch) | |
tree | 580eefad4cce1e883e7504b93352a9029b53036d /app-editors/emacs/emacs-29.0.9999-r1.ebuild | |
parent | 65e4244e411c4f65f55f2aa91f39e228f4c0680b (diff) |
gentoo auto-resync : 05:03:2023 - 23:52:45
Diffstat (limited to 'app-editors/emacs/emacs-29.0.9999-r1.ebuild')
-rw-r--r-- | app-editors/emacs/emacs-29.0.9999-r1.ebuild | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild index b06274d3a565..16e932a02739 100644 --- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild @@ -433,10 +433,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.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 @@ -539,10 +538,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() { |