From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CBB30138247 for ; Sat, 16 Nov 2013 12:41:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2A04E0AE0; Sat, 16 Nov 2013 12:41:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58C3AE0AE0 for ; Sat, 16 Nov 2013 12:41:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35AE733F164 for ; Sat, 16 Nov 2013 12:41:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C7BB9E530A for ; Sat, 16 Nov 2013 12:41:49 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1384605726.485def22d5a0dc4bfffd72d104e92cdb3cb0a38d.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/ X-VCS-Repository: proj/emacs X-VCS-Files: app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild X-VCS-Directories: app-emacs/emacs-common-gentoo/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 485def22d5a0dc4bfffd72d104e92cdb3cb0a38d X-VCS-Branch: master Date: Sat, 16 Nov 2013 12:41:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fb2ae6b6-430e-4e25-b588-ac8f31426914 X-Archives-Hash: f61527bcdd722f9de02d0efa8124cef8 commit: 485def22d5a0dc4bfffd72d104e92cdb3cb0a38d Author: Ulrich Müller gentoo org> AuthorDate: Sat Nov 16 12:42:06 2013 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Nov 16 12:42:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=485def22 Rearrange if statement in pkg_preinst. Package-Manager: portage-2.2.7 --- app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 10 +++++----- 1 file 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