[gentoo-commits] gentoo-x86 commit in eclass: elisp.eclass elisp-common.eclass

[Ulrich Mueller (ulm)]

ulm         09/10/08 10:50:35

  Modified:             elisp.eclass elisp-common.eclass
  Log:
  Sync from Emacs overlay (revision 1453).
  
  elisp.eclass:
  Generate Info files from Texinfo sources listed in ELISP_TEXINFO.
  
  elisp-common.eclass:
  Mark site-gentoo.el as buffer-read-only, in order to prevent
  unintentional edits. Add null strings to inhibit local variables
  detection in the eclass file itself.

Revision  Changes    Path
1.43                 eclass/elisp.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?r1=1.42&r2=1.43

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- elisp.eclass	25 Aug 2009 12:53:55 -0000	1.42
+++ elisp.eclass	8 Oct 2009 10:50:35 -0000	1.43
@@ -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/eclass/elisp.eclass,v 1.42 2009/08/25 12:53:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.43 2009/10/08 10:50:35 ulm Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.com>
@@ -33,11 +33,6 @@
 # variable before inheriting elisp.eclass.  Set it to the major version
 # your package uses and the dependency will be adjusted.
 
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# DOCS="blah.txt ChangeLog" is automatically used to install the given
-# files by dodoc in src_install().
-
 # @ECLASS-VARIABLE: ELISP_PATCHES
 # @DESCRIPTION:
 # Any patches to apply after unpacking the sources. Patches are searched
@@ -50,6 +45,16 @@
 # reserved for internal use.  "50${PN}-gentoo.el" is a reasonable choice
 # in most cases.
 
+# @ECLASS-VARIABLE: ELISP_TEXINFO
+# @DESCRIPTION:
+# Space separated list of Texinfo sources. Respective GNU Info files
+# will be generated in src_compile() and installed in src_install().
+
+# @ECLASS-VARIABLE: DOCS
+# @DESCRIPTION:
+# DOCS="blah.txt ChangeLog" is automatically used to install the given
+# files by dodoc in src_install().
+
 inherit elisp-common eutils
 
 case "${EAPI:-0}" in
@@ -105,6 +110,9 @@
 
 elisp_src_compile() {
 	elisp-compile *.el || die
+	if [ -n "${ELISP_TEXINFO}" ]; then
+		makeinfo ${ELISP_TEXINFO} || die
+	fi
 }
 
 elisp_src_install() {
@@ -112,6 +120,10 @@
 	if [ -n "${SITEFILE}" ]; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
+	if [ -n "${ELISP_TEXINFO}" ]; then
+		set -- ${ELISP_TEXINFO}
+		doinfo ${@/%.*/.info*} || die
+	fi
 	if [ -n "${DOCS}" ]; then
 		dodoc ${DOCS} || die
 	fi



1.62                 eclass/elisp-common.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?r1=1.61&r2=1.62

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- elisp-common.eclass	25 May 2009 16:25:32 -0000	1.61
+++ elisp-common.eclass	8 Oct 2009 10:50:35 -0000	1.62
@@ -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/eclass/elisp-common.eclass,v 1.61 2009/05/25 16:25:32 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.62 2009/10/08 10:50:35 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.com>
@@ -196,11 +196,11 @@
 # Generate a file with autoload definitions for the lisp functions.
 
 elisp-make-autoload-file() {
-	local f="${1:-${PN}-autoloads.el}"
+	local f="${1:-${PN}-autoloads.el}" null="" page=$'\f'
 	shift
 	ebegin "Generating autoload file for GNU Emacs"
 
-	sed 's/^FF/\f/' >"${f}" <<-EOF
+	cat >"${f}" <<-EOF
 	;;; ${f##*/} --- autoloads for ${P}
 
 	;;; Commentary:
@@ -208,12 +208,13 @@
 	;; DO NOT EDIT THIS FILE
 
 	;;; Code:
-	FF
-	;; Local Variables:
+	${page}
+	;; Local ${null}Variables:
 	;; version-control: never
 	;; no-byte-compile: t
 	;; no-update-autoloads: t
 	;; End:
+
 	;;; ${f##*/} ends here
 	EOF
 
@@ -282,7 +283,7 @@
 # location is still supported when generating site-gentoo.el.
 
 elisp-site-regen() {
-	local i sf line obsolete
+	local i sf line obsolete null="" page=$'\f'
 	local -a sflist
 
 	if [ ! -d "${ROOT}${SITELISP}" ]; then
@@ -336,9 +337,12 @@
 
 	(provide 'site-gentoo)
 
-	;; Local Variables:
+	${page}
+	;; Local ${null}Variables:
 	;; no-byte-compile: t
+	;; buffer-read-only: t
 	;; End:
+
 	;;; site-gentoo.el ends here
 	EOF