diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2019-11-18 13:09:05 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2019-11-18 13:09:21 +0100 |
| commit | 5d88d9b3360378c6149143cadc5a72e0daaeb585 (patch) | |
| tree | ebeb92d22b4465f4a959308652716ed00ddb3d46 /app-editors | |
| parent | dev-libs/libtommath: amd64 stable wrt bug #700422 (diff) | |
| download | gentoo-5d88d9b3360378c6149143cadc5a72e0daaeb585.tar.gz gentoo-5d88d9b3360378c6149143cadc5a72e0daaeb585.tar.bz2 gentoo-5d88d9b3360378c6149143cadc5a72e0daaeb585.zip | |
app-editors/emacs-vcs: Remove compatibility code in pkg_preinst.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild | 15 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 14 |
3 files changed, 6 insertions, 37 deletions
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild index 1b73de9ab193..5d69c80a079d 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild @@ -379,18 +379,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" || die - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild index e4a2a2cd7162..9880970c3fc9 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild @@ -377,19 +377,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index dc1e3f47c0a1..832d7156dc3b 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -386,18 +386,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" || die - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } |