diff options
Diffstat (limited to 'app-editors/emacs/emacs-23.4-r18.ebuild')
-rw-r--r-- | app-editors/emacs/emacs-23.4-r18.ebuild | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild index a5179566d3f6..9a48a465e91e 100644 --- a/app-editors/emacs/emacs-23.4-r18.ebuild +++ b/app-editors/emacs/emacs-23.4-r18.ebuild @@ -82,9 +82,6 @@ BDEPEND="alsa? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip )" -RDEPEND="${RDEPEND} - !<app-editors/emacs-vcs-${PV}" - EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" SITEFILE="20${PN}-${SLOT}-gentoo.el" # FULL_VERSION keeps the full version number, which is needed in @@ -287,9 +284,9 @@ src_install () { Y "${EPREFIX}${cdir}") X (let ((path (getenv "INFOPATH")) X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info + X ;; move Emacs Info dir before anything else in /usr/share X (let* ((p (cons nil (split-string path ":" t))) (q p)) X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) @@ -328,19 +325,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 } |