correct site-gentoo.el to be much more specific about what files should be included

refactor common-lisp pkg_prerm and pkg_postinst

2 files changed, 19 insertions, 11 deletions

diff --git a/eclass/common-lisp.eclass b/eclass/common-lisp.eclass
index 03c50bd14721..5ecb71e12b6a 100644
--- a/eclass/common-lisp.eclass
+++ b/eclass/common-lisp.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/common-lisp.eclass,v 1.5 2004/02/12 15:14:03 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.6 2004/03/09 17:52:56 mkennedy Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
@@ -14,7 +14,7 @@ INHERITED="$INHERITED $ECLASS"
 CLPACKAGE=
 newdepend "dev-lisp/common-lisp-controller"
 
-pkg_postinst() {
+common-lisp_pkg_postinst() {
 	if [ -z "${CLPACKAGE}" ]; then
 		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
 	else
@@ -25,7 +25,7 @@ pkg_postinst() {
 	fi
 }
 
-pkg_postrm() {
+common-lisp_pkg_postrm() {
 	if [ -z "${CLPACKAGE}" ]; then
 		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
 	else
@@ -39,6 +39,14 @@ pkg_postrm() {
 	fi
 }
 
+pkg_postinst() {
+	common-lisp_pkg_postinst
+}
+
+pkg_postrm() {
+	common-lisp_pkg_postrm
+}
+
 #
 # In pkg_preinst, we remove the FASL files for the previous version of
 # the source.
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 4541d6346a94..4b99e3a81004 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.4 2004/01/19 08:57:21 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.5 2004/03/09 17:52:56 mkennedy Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -43,25 +43,25 @@ elisp-site-regen() {
 ;;; -----------------------------------------------------------------
 
 EOF
-	ls ${SITELISP}/[0-9][0-9]* |sort -n |grep -vE '~$' | \
-	while read sf 
+	ls ${SITELISP}/[0-9][0-9]*-gentoo.el |sort -n | \
+	while read sf
 	do
-		einfo "  Adding $sf..."  
+		einfo "	 Adding $(basename $sf)..."
 		# Great for debugging, too noisy and slow for users though
-# 		echo "(message \"Loading $sf...\")" >>${SITELISP}/site-start.el
+#		echo "(message \"Loading $sf...\")" >>${SITELISP}/site-start.el
 		cat $sf >>${SITELISP}/site-gentoo.el
 	done
 	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
+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")
+	(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
@@ -85,7 +85,7 @@ elisp-comp() {
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License