Make logic for creation of site-start.el more predictable.

Package-Manager: portage-2.2_rc25/cvs/Linux i686

3 files changed, 21 insertions, 15 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 09ce5723811d..d69b6218849d 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,10 +1,11 @@
 # ChangeLog for x11-misc/emacs-desktop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.3 2009/03/13 09:12:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.4 2009/03/13 12:02:35 ulm Exp $
 
   13 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
   emacs-common-gentoo-1.0.ebuild:
-  Remove orphan files only if this is not a reinstall.
+  Remove orphan files only if this is not a reinstall. Make logic for creation
+  of site-start.el more predictable.
 
 *emacs-common-gentoo-1.0 (12 Mar 2009)
 *emacs-common-gentoo-0.3 (12 Mar 2009)
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index ced84da3b059..1591df7f7a29 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST emacs-common-gentoo-1.0.tar.gz 14268 RMD160 3dad4c2955fc8d9be095500305d67c36e587eef0 SHA1 2d646e3761a2eb23c359e0fb45743f553ade07b6 SHA256 eafc05a71b7b77084073ab82e9bf92c4a4dec1b61feb8a7adaa0b3194f95e2cd
 DIST emacs-desktop-0.3.tar.gz 14364 RMD160 bfcc3977ac602696330fde87878b2bc263267851 SHA1 9aab71bafad38be598d9f8ffcbd8c6b7b2a87854 SHA256 e4bc226140ce242679c400298a3760441dfd33e37f9e9a7f01f960b4a6eb97ae
 EBUILD emacs-common-gentoo-0.3.ebuild 1006 RMD160 946600929dc6f9339ec7920ae053a04e45083008 SHA1 936e6d8353f23e47728bf2703398cfca4ea3970c SHA256 151f5e9325afe96db2c0f156b4ca21004ac6341240fd38e8fa82b4eb0f1037c1
-EBUILD emacs-common-gentoo-1.0.ebuild 3342 RMD160 e390b8b687009f9b8bbf1f5d3ae5901281676bc7 SHA1 05b14b0ea04ff586086906ab0f58d3ab25361a56 SHA256 9bc9de844a8bbf976982b99b50d05bd485f5af662b1c5b9a39fc3bf116948b8b
-MISC ChangeLog 4278 RMD160 f93039fa0d5fbd4da715506a76b1fd1c0121d058 SHA1 b3cc3fd34337766e14945ea465537a8939ec2ca0 SHA256 140b1ce01c0e6dbd5ea7345f7f1846c906beb2032d68de36c8f97e0723455855
+EBUILD emacs-common-gentoo-1.0.ebuild 3444 RMD160 900dbc7fce9dc42d211ef7363957a34cbb619feb SHA1 487e09db46044edd2bd186e23c9dca0534dff12a SHA256 2df9edb7da5fa908c702edfbe974e0a644437cc332b151c7c11894582c0ce633
+MISC ChangeLog 4339 RMD160 e3b6086b84491fb919ba1f6cdc8e0c5d17d02670 SHA1 d28c784f469060d5a4b840fb94f80d260e0f6b35 SHA256 1628111b0bfd60d93a30a14ab53ed1cc3af77868acc241ba63094b80e13b0928
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkm6I90ACgkQOeoy/oIi7uw75wCcCaj0wsBnuew60Db0TK32LAmh
-EkIAoJFck9ZNP3BvwFLlgDRf84By7868
-=qsY0
+iEYEARECAAYFAkm6S6oACgkQOeoy/oIi7uxbBQCcCVWYld+PySthNi8XRJ8tSaI9
+pvIAnRI49JcV6vIGU15oie2c9nwI7wiZ
+=oVky
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
index 2e5ecfb2e8b7..b06e39bc628e 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.3 2009/03/13 09:12:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.4 2009/03/13 12:02:35 ulm Exp $
 
 inherit elisp-common eutils fdo-mime gnome2-utils
 
@@ -22,6 +22,9 @@ pkg_setup() {
 		ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
 		rm -f "${ROOT}${SITELISP}/subdirs.el"
 	fi
+
+	NEW_INSTALL=""
+	has_version ${CATEGORY}/${PN} || NEW_INSTALL="true"
 }
 
 src_install() {
@@ -75,6 +78,9 @@ pkg_postinst() {
 		gnome2_icon_cache_update
 	fi
 
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	elisp-site-regen
+
 	if [ ! -e "${ROOT}${SITELISP}/site-start.el" ]; then
 		echo
 		while read line; do elog "${line:- }"; done <<-EOF
@@ -94,16 +100,15 @@ pkg_postinst() {
 		EOF
 		echo
 
-		if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ]; then
-			# This seems to be a new install. Create site-gentoo.el and
-			# a default site-start.el, so that Gentoo packages will work.
-			elisp-site-regen
+		if [ "${NEW_INSTALL}" ]; then
+			# This is a new install. Create default site-start.el, so that
+			# Gentoo packages will work.
 			make-site-start
 		else
-			# site-gentoo.el already exists. Give a hint how to
-			# (re-)create the site-start.el file.
+			# This package was already installed, but site-start.el does
+			# not exist. Give a hint how to (re-)create it.
 			elog "If this is a new install, you may want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "emerge --config =${CATEGORY}/${PF}"
 		fi
 	fi
 }