From 1c33e521c460dc40899ce7bc919602b842ce27e2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Mar 2023 23:52:45 +0000 Subject: gentoo auto-resync : 05:03:2023 - 23:52:45 --- app-editors/emacs/emacs-27.2-r11.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'app-editors/emacs/emacs-27.2-r11.ebuild') diff --git a/app-editors/emacs/emacs-27.2-r11.ebuild b/app-editors/emacs/emacs-27.2-r11.ebuild index bbe0dd17f23d..314d7da47ad8 100644 --- a/app-editors/emacs/emacs-27.2-r11.ebuild +++ b/app-editors/emacs/emacs-27.2-r11.ebuild @@ -307,10 +307,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 @@ -413,10 +412,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() { -- cgit v1.2.3