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

[Ulrich Mueller (ulm)]

ulm         10/08/22 08:30:32

  Modified:             elisp.eclass elisp-common.eclass
  Log:
  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.

Revision  Changes    Path
1.45                 eclass/elisp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?r1=1.44&r2=1.45

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- elisp.eclass	30 Jan 2010 22:54:00 -0000	1.44
+++ elisp.eclass	22 Aug 2010 08:30:32 -0000	1.45
@@ -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@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.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().



1.66                 eclass/elisp-common.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.65&r2=1.66

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- elisp-common.eclass	29 Dec 2009 20:15:12 -0000	1.65
+++ elisp-common.eclass	22 Aug 2010 08:30:32 -0000	1.66
@@ -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@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.com>
 # Copyright 2004-2005 Mamoru Komachi <usata@g.o>
 # Copyright 2007-2008 Christian Faulhammer <fauli@g.o>
-# Copyright 2007-2009 Ulrich Müller <ulm@g.o>
+# Copyright 2007-2010 Ulrich Müller <ulm@g.o>
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -303,10 +303,6 @@
 	# 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 @@
 		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 @@
 		# 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 @@
 		esac
 	fi
 
-	# cleanup
-	rm -f "${T}"/site-gentoo.el
-
 	return 0
 }