diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-03-05 11:58:59 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2023-03-05 12:00:24 +0100 |
| commit | 1c107237c1c1451c149e7e345032e973737b32e2 (patch) | |
| tree | d8b59419455fe8c97768b46e94b84eb9ae97d592 /app-editors/emacs/emacs-30.0.9999.ebuild | |
| parent | dev-libs/girara: drop old. (diff) | |
| download | gentoo-1c107237c1c1451c149e7e345032e973737b32e2.tar.gz gentoo-1c107237c1c1451c149e7e345032e973737b32e2.tar.bz2 gentoo-1c107237c1c1451c149e7e345032e973737b32e2.zip | |
app-editors/emacs: Remove pre-2011 workaround for Info dir
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'app-editors/emacs/emacs-30.0.9999.ebuild')
| -rw-r--r-- | app-editors/emacs/emacs-30.0.9999.ebuild | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index a1fdc765f4c4..257e0e3e5c92 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.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,16 +538,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name + # verify that the PM hasn't removed our Info directory index #257260 local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" - if [[ -f ${infodir}/dir.orig ]]; then - mv "${infodir}"/dir{.orig,} || die - elif [[ -d ${infodir} ]]; then - # this can happen when preinst is run twice, e.g. when - # installing a binpkg that was created with quickpkg #899648 - ewarn "Unexpected \"dir\" file in ${infodir} - preinst run twice?" - [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die - fi + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { |