diff options
| -rw-r--r-- | app-emacs/emacs-common-gentoo/ChangeLog | 3 | ||||
| -rw-r--r-- | app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index 08c1817..9423076 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Jul 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: + Sync from Portage tree. + 25 Apr 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: Update EGIT_REPO_URI. diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild index 9f0d73e..4bd5cd9 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -75,11 +75,11 @@ src_install() { pkg_preinst() { # make sure that site-gentoo.el exists since site-start.el requires it - if [[ ! -d ${EROOT}${SITELISP} ]]; then + if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then #554518 mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die - else + fi + if [[ -d ${EROOT}${SITELISP} ]]; then elisp-site-regen - rm "${ED}${SITELISP}/site-gentoo.el.orig" || die cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die fi |