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 7B6AF138247 for ; Fri, 15 Nov 2013 13:43:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF78CE09FB; Fri, 15 Nov 2013 13:43:01 +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 74B15E09FB for ; Fri, 15 Nov 2013 13:43:01 +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 8ADD033F174 for ; Fri, 15 Nov 2013 13:43:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2EF1FE530A for ; Fri, 15 Nov 2013 13:42:58 +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: <1384523038.e94e71c712dd52c9f1c6b9543eff519898f2e08f.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: e94e71c712dd52c9f1c6b9543eff519898f2e08f X-VCS-Branch: master Date: Fri, 15 Nov 2013 13:42:58 +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: d29efcc4-4acf-4612-81b4-4ecfdc64682a X-Archives-Hash: 0f046f69ca1eb6ec9606b9b4d9dbeb39 commit: e94e71c712dd52c9f1c6b9543eff519898f2e08f Author: Ulrich Müller gentoo org> AuthorDate: Fri Nov 15 13:43:58 2013 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Nov 15 13:43:58 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=e94e71c7 Install initial site-gentoo.el file from tarball. Package-Manager: portage-2.2.7 --- app-emacs/emacs-common-gentoo/ChangeLog | 3 +++ app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index 613b87d..9a7611a 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Nov 2013; Ulrich Müller emacs-common-gentoo-9999.ebuild: + Install initial site-gentoo.el file from tarball. + 13 Nov 2013; Ulrich Müller emacs-common-gentoo-9999.ebuild: Refuse installation if the site-start.el file is still in its old location; we have warned about this since almost two years. 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 8994fe0..f60db4f 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -34,6 +34,7 @@ pkg_setup() { src_install() { insinto "${SITELISP}" doins subdirs.el + newins site-gentoo.el site-gentoo.el.orig keepdir /etc/emacs insinto /etc/emacs @@ -93,8 +94,13 @@ site-start-modified-p() { pkg_preinst() { # make sure that site-gentoo.el exists since site-start.el requires it - elisp-site-regen - cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die + if [[ -d ${EROOT}${SITELISP} ]]; then + 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 + fi if use games; then local f