diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
| commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
| tree | 3cb05783d73b2c33589ba305144a31c718e123cd /app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | |
| parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) | |
gentoo resync : 03.03.2019
Diffstat (limited to 'app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild')
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 20 |
1 files changed, 8 insertions, 12 deletions
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 5450edeeb08a..735fbb98de76 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -143,8 +143,7 @@ src_prepare() { eapply_user # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die AT_M4DIR=m4 eautoreconf } @@ -288,14 +287,12 @@ src_compile() { src_install () { emake DESTDIR="${D}" NO_BIN_LINK=t install - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + 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 "moving info dir failed" + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig @@ -380,15 +377,14 @@ 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" + 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 "install-info failed" + install-info --info-dir="${ED}"${infodir} "${f}" || die fi done fi |