[gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     e94e71c712dd52c9f1c6b9543eff519898f2e08f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 13:43:58 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+  Install initial site-gentoo.el file from tarball.
+
   13 Nov 2013; Ulrich Müller <ulm@gentoo.org> 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