Changed elisp-common.eclass to use site-gentoo.el, rather than

site-lisp.el.

1 files changed, 24 insertions, 7 deletions

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index d87498e9b05e..4541d6346a94 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.3 2003/11/03 10:01:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.4 2004/01/19 08:57:21 jbms Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -36,9 +36,9 @@ elisp-site-file-install() {
 }
 
 elisp-site-regen() {
-	einfo "Regenerating ${SITELISP}/site-start.el..."
+	einfo "Regenerating ${SITELISP}/site-gentoo.el..."
 	einfo ""
-	cat <<EOF >${SITELISP}/site-start.el
+	cat <<EOF >${SITELISP}/site-gentoo.el
 ;;; DO NOT EDIT THIS FILE -- IT IS GENERATED AUTOMATICALLY BY PORTAGE
 ;;; -----------------------------------------------------------------
 
@@ -49,9 +49,26 @@ EOF
 		einfo "  Adding $sf..."  
 		# Great for debugging, too noisy and slow for users though
 # 		echo "(message \"Loading $sf...\")" >>${SITELISP}/site-start.el
-		cat $sf >>${SITELISP}/site-start.el
+		cat $sf >>${SITELISP}/site-gentoo.el
 	done
-	einfo ""
+	while read line; do einfo "${line}"; done <<EOF
+
+All site initialization for Gentoo-installed packages is now added to
+/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer
+managed by Gentoo.  You may want to remove the generated
+site-start.el.
+
+In order for this site initialization to be loaded for all users
+automatically, as was done previously, you can add a line like this:
+
+    (load "/usr/share/emacs/site-lisp/site-gentoo")
+
+to /usr/share/emacs/site-lisp/site-start.el.  Alternatively, that line
+can be added by individual users to their initialization files, or for
+greater flexibility, users can select which of the package-specific
+initialization files in /usr/share/emacs/site-lisp to load.
+EOF
+	echo
 }
 
 # The following Emacs Lisp compilation routine is taken from GNU
@@ -94,8 +111,8 @@ elisp-comp() {
 		exit 1
 	else
 		if test -z "$EMACS" || test "$EMACS" = "t"; then
-      # Value of "t" means we are running in a shell under Emacs.
-      # Just assume Emacs is called "emacs".
+		# Value of "t" means we are running in a shell under Emacs.
+		# Just assume Emacs is called "emacs".
 			EMACS=emacs
 		fi