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 9CA4F138D14 for ; Sun, 12 Jul 2015 06:53:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DD54E08FA; Sun, 12 Jul 2015 06:53:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2291E08FA for ; Sun, 12 Jul 2015 06:53:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA460340873 for ; Sun, 12 Jul 2015 06:53:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 929EC738 for ; Sun, 12 Jul 2015 06:53:10 +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: <1436683876.15bf2c07e61bbadcc5619137351ad4fb88ab1569.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/ChangeLog 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: 15bf2c07e61bbadcc5619137351ad4fb88ab1569 X-VCS-Branch: master Date: Sun, 12 Jul 2015 06:53:10 +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: 01f451d4-9ae1-44bf-9318-32cc72eb1b04 X-Archives-Hash: 468b923d38df8f59a083fe20cc520278 commit: 15bf2c07e61bbadcc5619137351ad4fb88ab1569 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jul 12 06:51:16 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jul 12 06:51:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=15bf2c07 Sync from Portage tree. Package-Manager: portage-2.2.20 app-emacs/emacs-common-gentoo/ChangeLog | 3 +++ 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 emacs-common-gentoo-9999.ebuild: + Sync from Portage tree. + 25 Apr 2015; Ulrich Müller 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