separated elisp into elisp and elisp-common

2 files changed, 69 insertions, 43 deletions

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
new file mode 100644
index 000000000000..ed33d1b41988
--- /dev/null
+++ b/eclass/elisp-common.eclass
@@ -0,0 +1,56 @@
+# 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.1 2003/09/21 01:40:41 mkennedy Exp $
+#
+# Author Matthew Kennedy <mkennedy@gentoo.org>
+#
+# This is not an eclass, but it does provide emacs-related
+# installation utilities.
+
+ECLASS=elisp-common
+INHERITED="$INHERITED $ECLASS"
+
+SITELISP=/usr/share/emacs/site-lisp
+
+elisp-install() {
+	local subdir=$1
+	dodir ${SITELISP}/${subdir}
+	insinto ${SITELISP}/${subdir}
+	shift
+	doins $@
+}
+
+elisp-site-file-install() {
+	local sitefile=$1
+	pushd ${S}
+	cp ${sitefile} .
+	D=${S}/ dosed "s:@SITELISP@:${SITELISP}/${PN}:g" $(basename ${sitefile})
+	insinto ${SITELISP}
+	doins ${S}/$(basename ${sitefile})
+	popd
+}
+
+elisp-site-regen() {
+	einfo "Regenerating ${SITELISP}/site-start.el..."
+	einfo ""
+	cat <<EOF >${SITELISP}/site-start.el
+;;; DO NOT EDIT THIS FILE -- IT IS GENERATED AUTOMATICALLY BY PORTAGE
+;;; -----------------------------------------------------------------
+
+EOF
+	ls ${SITELISP}/[0-9][0-9]* |sort -n |grep -vE '~$' | \
+	while read sf 
+	do
+		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
+	done
+	einfo ""
+}
+
+# Local Variables: ***
+# mode: shell-script ***
+# tab-width: 4 ***
+# indent-tabs-mode: t ***
+# End: ***
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index e16d219d2c46..c760e37e296d 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,62 +1,27 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.7 2003/09/20 22:27:08 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.8 2003/09/21 01:40:41 mkennedy Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
 # This eclass sets the site-lisp directory for emacs-related packages.
 
+inherit elisp-common
+
 ECLASS=elisp
 INHERITED="$INHERITED $ECLASS"
 
-SITELISP=/usr/share/emacs/site-lisp
-
-elisp-install() {
-	local subdir=$1
-	dodir ${SITELISP}/${subdir}
-	insinto ${SITELISP}/${subdir}
-	shift
-	doins $@
-}
-
-elisp-site-file-install() {
-	local sitefile=$1
-	pushd ${S}
-	cp ${sitefile} .
-	D=${S}/ dosed "s:@SITELISP@:${SITELISP}/${PN}:g" $(basename ${sitefile})
-	insinto ${SITELISP}
-	doins ${S}/$(basename ${sitefile})
-	popd
-}
-
-elisp-site-regen() {
-	einfo "Regenerating ${SITELISP}/site-start.el..."
-	einfo ""
-	cat <<EOF >${SITELISP}/site-start.el
-;;; DO NOT EDIT THIS FILE -- IT IS GENERATED AUTOMATICALLY BY PORTAGE
-;;; -----------------------------------------------------------------
-
-EOF
-	ls ${SITELISP}/[0-9][0-9]* |sort -n |grep -vE '~$' | \
-	while read sf 
-	do
-		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
-	done
-	einfo ""
-}
-
-# DEFAULT OVERRIDES
+source /usr/portage/eclass/elisp-common.eclass
 
 # SRC_URI should be set to wherever the primary app-emacs/ maintainer
 # keeps the local elisp mirror, since most app-emacs packages are
-# upstream as a single .el file
+# upstream as a single .el file.
+
+# Note: This is no longer necessary.
 
 SRC_URI="http://cvs.gentoo.org/~mkennedy/app-emacs/${P}.el.bz2"
 S="${WORKDIR}/"
-# newdepend "virtual/emacs"
+newdepend "virtual/emacs"
 IUSE=""
 
 src_unpack() {
@@ -84,3 +49,8 @@ pkg_postrm() {
 	elisp-site-regen
 }
 
+# Local Variables: ***
+# mode: shell-script ***
+# tab-width: 4 ***
+# indent-tabs-mode: t ***
+# End: ***