Sync eclasses from Emacs overlay (revision 1506).

elisp.eclass:
Update documentation.

elisp-common.eclass:
The nullglob shell option is not needed in elisp-site-regen, because
inside the loop we test for existence of all files. See also bug 328863.
The temporary file needs only be removed in the no changes case.

2 files changed, 10 insertions, 13 deletions

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 7b21db63acf4..d535b2d6bc64 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.65 2009/12/29 20:15:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.66 2010/08/22 08:30:32 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
 # Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org>
 # Copyright 2007-2008 Christian Faulhammer <fauli@gentoo.org>
-# Copyright 2007-2009 Ulrich Müller <ulm@gentoo.org>
+# Copyright 2007-2010 Ulrich Müller <ulm@gentoo.org>
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -303,10 +303,6 @@ elisp-site-regen() {
 	# auxiliary file for backwards compatibility. Remove any such file.
 	rm -f "${sitelisp}"/00site-gentoo.el
 
-	# set nullglob option, there may be a directory without matching files
-	local old_shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
 	for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \
 		"${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el
 	do
@@ -319,8 +315,6 @@ elisp-site-regen() {
 		sflist[i]=${sf}
 	done
 
-	eval "${old_shopts}"
-
 	cat <<-EOF >"${T}"/site-gentoo.el
 	;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
 
@@ -349,6 +343,7 @@ elisp-site-regen() {
 		# This prevents outputting unnecessary text when there
 		# was actually no change.
 		# A case is a remerge where we have doubled output.
+		rm -f "${T}"/site-gentoo.el
 		echo " no changes."
 	else
 		mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
@@ -360,8 +355,5 @@ elisp-site-regen() {
 		esac
 	fi
 
-	# cleanup
-	rm -f "${T}"/site-gentoo.el
-
 	return 0
 }
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 3238c559cf20..502518d6352c 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.44 2010/01/30 22:54:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.45 2010/08/22 08:30:32 ulm Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -28,17 +28,20 @@
 # ${PN}.el in src_unpack().
 
 # @ECLASS-VARIABLE: NEED_EMACS
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # If you need anything different from Emacs 21, use the NEED_EMACS
 # variable before inheriting elisp.eclass.  Set it to the major version
 # your package uses and the dependency will be adjusted.
 
 # @ECLASS-VARIABLE: ELISP_PATCHES
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Any patches to apply after unpacking the sources. Patches are searched
 # both in ${PWD} and ${FILESDIR}.
 
 # @ECLASS-VARIABLE: SITEFILE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Name of package's site-init file.  The filename must match the shell
 # pattern "[1-8][0-9]*-gentoo.el"; numbers below 10 and above 89 are
@@ -46,11 +49,13 @@
 # in most cases.
 
 # @ECLASS-VARIABLE: ELISP_TEXINFO
+# @DEFAULT_UNSET
 # @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
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # DOCS="blah.txt ChangeLog" is automatically used to install the given
 # files by dodoc in src_install().