summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-11-16 13:42:06 +0100
committerUlrich Müller <ulm@gentoo.org>2013-11-16 13:42:06 +0100
commit485def22d5a0dc4bfffd72d104e92cdb3cb0a38d (patch)
tree60c4a37a7ea2de6dc9c2280d1ecc8a477d51fa72 /app-emacs
parentInstall initial site-gentoo.el file from tarball. (diff)
downloademacs-485def22d5a0dc4bfffd72d104e92cdb3cb0a38d.tar.gz
emacs-485def22d5a0dc4bfffd72d104e92cdb3cb0a38d.tar.bz2
emacs-485def22d5a0dc4bfffd72d104e92cdb3cb0a38d.zip
Rearrange if statement in pkg_preinst.
Package-Manager: portage-2.2.7
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild10
1 files changed, 5 insertions, 5 deletions
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 f60db4f..4c0affa 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -34,7 +34,7 @@ pkg_setup() {
src_install() {
insinto "${SITELISP}"
doins subdirs.el
- newins site-gentoo.el site-gentoo.el.orig
+ newins site-gentoo.el{,.orig}
keepdir /etc/emacs
insinto /etc/emacs
@@ -94,12 +94,12 @@ site-start-modified-p() {
pkg_preinst() {
# make sure that site-gentoo.el exists since site-start.el requires it
- if [[ -d ${EROOT}${SITELISP} ]]; then
+ if [[ ! -d ${EROOT}${SITELISP} ]]; then
+ mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ else
elisp-site-regen
- cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
- else
- mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
fi
if use games; then