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

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

[Ulrich Mueller (ulm)]

ulm         14/06/11 09:13:36

  Modified:             elisp-common.eclass
  Log:
  Update version number in example.

Revision  Changes    Path
1.90                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- elisp-common.eclass	24 May 2014 08:48:40 -0000	1.89
+++ elisp-common.eclass	11 Jun 2014 09:13:36 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.89 2014/05/24 08:48:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.90 2014/06/11 09:13:36 ulm Exp $
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -30,15 +30,15 @@
 # to your DEPEND/RDEPEND line and use the functions provided here to
 # bring the files to the correct locations.
 #
-# If your package requires a minimum Emacs version, e.g. Emacs 23, then
-# the dependency should be on >=virtual/emacs-23 instead.  Because the
+# If your package requires a minimum Emacs version, e.g. Emacs 24, then
+# the dependency should be on >=virtual/emacs-24 instead.  Because the
 # user can select the Emacs executable with eselect, you should also
 # make sure that the active Emacs version is sufficient.  This can be
 # tested with function elisp-need-emacs(), which would typically be
 # called from pkg_setup(), as in the following example:
 #
 # @CODE
-# 	elisp-need-emacs 23 || die "Emacs version too low"
+# 	elisp-need-emacs 24 || die "Emacs version too low"
 # @CODE
 #
 # Please note that such tests should be limited to packages that are

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

[Ulrich Mueller (ulm)]

ulm         15/05/25 12:52:56

  Modified:             elisp-common.eclass
  Log:
  Consistent spelling.

Revision  Changes    Path
1.93                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- elisp-common.eclass	24 May 2015 21:46:16 -0000	1.92
+++ elisp-common.eclass	25 May 2015 12:52:56 -0000	1.93
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.92 2015/05/24 21:46:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.93 2015/05/25 12:52:56 ulm Exp $
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
-# Gentoo GNU Emacs Project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>

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

[Ulrich Mueller (ulm)]

ulm         11/10/09 09:10:41

  Modified:             elisp-common.eclass
  Log:
  Clarify policy on site-init files in eclass documentation.

Revision  Changes    Path
1.76                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- elisp-common.eclass	30 Aug 2011 20:10:13 -0000	1.75
+++ elisp-common.eclass	9 Oct 2011 09:10:41 -0000	1.76
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.75 2011/08/30 20:10:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.76 2011/10/09 09:10:41 ulm Exp $
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -94,6 +94,8 @@
 # many Emacs support files, users may be annoyed by the start-up time.
 # Also avoid keybindings as they might interfere with the user's
 # settings.  Give a hint in pkg_postinst(), which should be enough.
+# The guiding principle is that emerging your package should not by
+# itself cause a change of standard Emacs behaviour.
 #
 # The naming scheme for this site-init file matches the shell pattern
 # "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define

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

[Ulrich Mueller (ulm)]

ulm         11/08/13 12:19:39

  Modified:             elisp-common.eclass
  Log:
  Sync elisp-common.eclass from Emacs overlay (revision 1670):
  Error handling in function elisp-emacs-version.

Revision  Changes    Path
1.72                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- elisp-common.eclass	19 Feb 2011 10:12:42 -0000	1.71
+++ elisp-common.eclass	13 Aug 2011 12:19:39 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.71 2011/02/19 10:12:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.72 2011/08/13 12:19:39 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -171,10 +171,16 @@
 # Output version of currently active Emacs.
 
 elisp-emacs-version() {
+	local ret
 	# The following will work for at least versions 18-23.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
 	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
+	ret=$?
 	rm -f "${T}"/emacs-version.el
+	if [[ ${ret} -ne 0 ]]; then
+		eerror "elisp-emacs-version: Failed to run ${EMACS}"
+	fi
+	return ${ret}
 }
 
 # @FUNCTION: elisp-need-emacs
@@ -185,8 +191,8 @@
 # specified as argument.
 
 elisp-need-emacs() {
-	local need_emacs=$1
-	local have_emacs=$(elisp-emacs-version)
+	local need_emacs=$1 have_emacs
+	have_emacs=$(elisp-emacs-version) || return
 	einfo "Emacs version: ${have_emacs}"
 	if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then
 		eerror "This package needs at least Emacs ${need_emacs%%.*}."

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

[Ulrich Mueller (ulm)]

ulm         11/02/19 10:12:42

  Modified:             elisp-common.eclass
  Log:
  Add missing pair of quotation marks.

Revision  Changes    Path
1.71                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- elisp-common.eclass	29 Nov 2010 17:07:22 -0000	1.70
+++ elisp-common.eclass	19 Feb 2011 10:12:42 -0000	1.71
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.70 2010/11/29 17:07:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.71 2011/02/19 10:12:42 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-2010 Ulrich Müller <ulm@gentoo.org>
+# Copyright 2007-2011 Ulrich Müller <ulm@gentoo.org>
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -284,7 +284,7 @@
 		|| ewarn "elisp-site-file-install: bad name of site-init file"
 	sf="${T}/${sf/%-gentoo*.el/-gentoo.el}"
 	ebegin "Installing site initialisation file for GNU Emacs"
-	[[ $1 = ${sf} ]] || cp "$1" "${sf}"
+	[[ $1 = "${sf}" ]] || cp "$1" "${sf}"
 	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
 		-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
 		-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g;\$q" "${sf}"

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

[Ulrich Mueller (ulm)]

ulm         10/11/29 17:07:22

  Modified:             elisp-common.eclass
  Log:
  Sync from Emacs overlay (revision 1547).
  Order of functions rearranged. Whitespace change in site-gentoo.el.

Revision  Changes    Path
1.70                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- elisp-common.eclass	23 Nov 2010 20:56:08 -0000	1.69
+++ elisp-common.eclass	29 Nov 2010 17:07:22 -0000	1.70
@@ -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-common.eclass,v 1.69 2010/11/23 20:56:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.70 2010/11/29 17:07:22 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -166,25 +166,6 @@
 # Emacs flags used for byte-compilation in elisp-compile().
 BYTECOMPFLAGS="-L ."
 
-# @FUNCTION: elisp-compile
-# @USAGE: <list of elisp files>
-# @DESCRIPTION:
-# Byte-compile Emacs Lisp files.
-#
-# This function uses GNU Emacs to byte-compile all ".el" specified by
-# its arguments.  The resulting byte-code (".elc") files are placed in
-# the same directory as their corresponding source file.
-#
-# The current directory is added to the load-path.  This will ensure
-# that interdependent Emacs Lisp files are visible between themselves,
-# in case they require or load one another.
-
-elisp-compile() {
-	ebegin "Compiling GNU Emacs Elisp files"
-	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
-	eend $? "elisp-compile: batch-byte-compile failed"
-}
-
 # @FUNCTION: elisp-emacs-version
 # @DESCRIPTION:
 # Output version of currently active Emacs.
@@ -215,6 +196,25 @@
 	return 0
 }
 
+# @FUNCTION: elisp-compile
+# @USAGE: <list of elisp files>
+# @DESCRIPTION:
+# Byte-compile Emacs Lisp files.
+#
+# This function uses GNU Emacs to byte-compile all ".el" specified by
+# its arguments.  The resulting byte-code (".elc") files are placed in
+# the same directory as their corresponding source file.
+#
+# The current directory is added to the load-path.  This will ensure
+# that interdependent Emacs Lisp files are visible between themselves,
+# in case they require or load one another.
+
+elisp-compile() {
+	ebegin "Compiling GNU Emacs Elisp files"
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
+	eend $? "elisp-compile: batch-byte-compile failed"
+}
+
 # @FUNCTION: elisp-make-autoload-file
 # @USAGE: [output file] [list of directories]
 # @DESCRIPTION:
@@ -353,9 +353,9 @@
 	sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el
 	cat <<-EOF >>"${T}"/site-gentoo.el
 
+	${page}
 	(provide 'site-gentoo)
 
-	${page}
 	;; Local ${null}Variables:
 	;; no-byte-compile: t
 	;; buffer-read-only: t

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

[Ulrich Mueller (ulm)]

ulm         10/10/09 15:30:50

  Modified:             elisp-common.eclass
  Log:
  Add a comment about naming of site-init files.

Revision  Changes    Path
1.68                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- elisp-common.eclass	17 Sep 2010 07:41:05 -0000	1.67
+++ elisp-common.eclass	9 Oct 2010 15:30:43 -0000	1.68
@@ -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-common.eclass,v 1.67 2010/09/17 07:41:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.68 2010/10/09 15:30:43 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -87,7 +87,9 @@
 # "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define
 # the loading order (numbers below 10 or above 89 are reserved for
 # internal use).  So if your initialisation depends on another Emacs
-# package, your site file's number must be higher!
+# package, your site file's number must be higher!  If there are no such
+# interdependencies then the number should be 50.  Otherwise, numbers
+# divisible by 10 are preferred.
 #
 # Best practice is to define a SITEFILE variable in the global scope of
 # your ebuild (e.g., right after S or RDEPEND):

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

[Ulrich Mueller (ulm)]

ulm         10/09/17 07:41:05

  Modified:             elisp-common.eclass
  Log:
  Change comment in generated autoload file.

Revision  Changes    Path
1.67                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- elisp-common.eclass	22 Aug 2010 08:30:32 -0000	1.66
+++ elisp-common.eclass	17 Sep 2010 07:41:05 -0000	1.67
@@ -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-common.eclass,v 1.66 2010/08/22 08:30:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.67 2010/09/17 07:41:05 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -201,7 +201,7 @@
 	ebegin "Generating autoload file for GNU Emacs"
 
 	cat >"${f}" <<-EOF
-	;;; ${f##*/} --- autoloads for ${P}
+	;;; ${f##*/} --- autoloads for ${PN}
 
 	;;; Commentary:
 	;; Automatically generated by elisp-common.eclass

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

[Ulrich Mueller (ulm)]

ulm         09/12/29 20:15:13

  Modified:             elisp-common.eclass
  Log:
  Sync from Emacs overlay (revision 1477).
  Remove the warning about obsolete files; the install location was
  changed two years ago.

Revision  Changes    Path
1.65                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- elisp-common.eclass	7 Dec 2009 21:05:08 -0000	1.64
+++ elisp-common.eclass	29 Dec 2009 20:15:12 -0000	1.65
@@ -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.64 2009/12/07 21:05:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.65 2009/12/29 20:15:12 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -284,7 +284,7 @@
 
 elisp-site-regen() {
 	local sitelisp=${ROOT}${EPREFIX}${SITELISP}
-	local i sf line obsolete null="" page=$'\f'
+	local sf i line null="" page=$'\f'
 	local -a sflist
 
 	if [ ! -d "${sitelisp}" ]; then
@@ -317,8 +317,6 @@
 			sflist[i]=${sflist[i-1]}
 		done
 		sflist[i]=${sf}
-		# set a flag if there are obsolete files
-		[ "${sf%/*}" = "${sitelisp}" ] && obsolete=t
 	done
 
 	eval "${old_shopts}"
@@ -362,16 +360,6 @@
 		esac
 	fi
 
-	if [ "${obsolete}" ]; then
-		echo
-		while read line; do ewarn "${line}"; done <<-EOF
-		Site-initialisation files of Emacs packages are now installed in
-		/usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
-		that you use app-admin/emacs-updater to rebuild the installed
-		Emacs packages.
-		EOF
-	fi
-
 	# cleanup
 	rm -f "${T}"/site-gentoo.el
 

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

[Ulrich Mueller (ulm)]

ulm         09/12/07 21:05:08

  Modified:             elisp-common.eclass
  Log:
  Partial sync from Emacs overlay (revision 1477).
  Prepare for Prefix support.

Revision  Changes    Path
1.64                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- elisp-common.eclass	22 Nov 2009 12:06:43 -0000	1.63
+++ elisp-common.eclass	7 Dec 2009 21:05:08 -0000	1.64
@@ -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.63 2009/11/22 12:06:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.64 2009/12/07 21:05:08 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -143,7 +143,7 @@
 # @ECLASS-VARIABLE: EMACS
 # @DESCRIPTION:
 # Path of Emacs executable.
-EMACS=/usr/bin/emacs
+EMACS=${EPREFIX}/usr/bin/emacs
 
 # @ECLASS-VARIABLE: EMACSFLAGS
 # @DESCRIPTION:
@@ -261,8 +261,8 @@
 	ebegin "Installing site initialisation file for GNU Emacs"
 	[[ $1 = ${sf} ]] || cp "$1" "${sf}"
 	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
-		-e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
-		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
+		-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
+		-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g;\$q" "${sf}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/site-gentoo.d"
 		doins "${sf}"
@@ -283,11 +283,12 @@
 # location is still supported when generating site-gentoo.el.
 
 elisp-site-regen() {
+	local sitelisp=${ROOT}${EPREFIX}${SITELISP}
 	local i sf line obsolete null="" page=$'\f'
 	local -a sflist
 
-	if [ ! -d "${ROOT}${SITELISP}" ]; then
-		eerror "elisp-site-regen: Directory ${SITELISP} does not exist"
+	if [ ! -d "${sitelisp}" ]; then
+		eerror "elisp-site-regen: Directory ${sitelisp} does not exist"
 		return 1
 	fi
 
@@ -300,14 +301,14 @@
 
 	# Until January 2009, elisp-common.eclass sometimes created an
 	# auxiliary file for backwards compatibility. Remove any such file.
-	rm -f "${ROOT}${SITELISP}"/00site-gentoo.el
+	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 "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el \
-		"${ROOT}${SITELISP}"/site-gentoo.d/[0-9][0-9]*.el
+	for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \
+		"${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el
 	do
 		[ -r "${sf}" ] || continue
 		# sort files by their basename. straight insertion sort.
@@ -317,7 +318,7 @@
 		done
 		sflist[i]=${sf}
 		# set a flag if there are obsolete files
-		[ "${sf%/*}" = "${ROOT}${SITELISP}" ] && obsolete=t
+		[ "${sf%/*}" = "${sitelisp}" ] && obsolete=t
 	done
 
 	eval "${old_shopts}"
@@ -346,14 +347,13 @@
 	;;; site-gentoo.el ends here
 	EOF
 
-	if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${T}"/site-gentoo.el
-	then
+	if cmp -s "${sitelisp}"/site-gentoo.el "${T}"/site-gentoo.el; then
 		# This prevents outputting unnecessary text when there
 		# was actually no change.
 		# A case is a remerge where we have doubled output.
 		echo " no changes."
 	else
-		mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
+		mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
 		echo
 		case ${#sflist[@]} in
 			0) ewarn "... Huh? No site initialisation files found." ;;

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

[Ulrich Mueller (ulm)]

ulm         09/11/22 12:06:43

  Modified:             elisp-common.eclass
  Log:
  Display a warning message if no site-init files were found.

Revision  Changes    Path
1.63                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- elisp-common.eclass	8 Oct 2009 10:50:35 -0000	1.62
+++ elisp-common.eclass	22 Nov 2009 12:06:43 -0000	1.63
@@ -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.62 2009/10/08 10:50:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.63 2009/11/22 12:06:43 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -355,7 +355,11 @@
 	else
 		mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
 		echo
-		einfo "... ${#sflist[@]} site initialisation file(s) included."
+		case ${#sflist[@]} in
+			0) ewarn "... Huh? No site initialisation files found." ;;
+			1) einfo "... ${#sflist[@]} site initialisation file included." ;;
+			*) einfo "... ${#sflist[@]} site initialisation files included." ;;
+		esac
 	fi
 
 	if [ "${obsolete}" ]; then

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

[Christian Faulhammer (fauli)]

fauli       09/05/25 16:25:32

  Modified:             elisp-common.eclass
  Log:
  Remove comment line from example site-init file

Revision  Changes    Path
1.61                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- elisp-common.eclass	14 Apr 2009 15:45:45 -0000	1.60
+++ elisp-common.eclass	25 May 2009 16:25:32 -0000	1.61
@@ -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.60 2009/04/14 15:45:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.61 2009/05/25 16:25:32 fauli Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -65,8 +65,6 @@
 # startup code (have a look in the documentation of your software).
 # Normally this would look like this:
 #
-#   	;;; csv-mode site-lisp configuration
-#
 #   	(add-to-list 'load-path "@SITELISP@")
 #   	(add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode))
 #   	(autoload 'csv-mode "csv-mode" "Major mode for csv files." t)

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

[Ulrich Mueller (ulm)]

ulm         09/04/14 15:45:45

  Modified:             elisp-common.eclass
  Log:
  Sync from Emacs overlay (revision 1379).
  
  Remove all code in elisp-site-regen related to site-start.el; it is
  now installed by emacs-common-gentoo. Suppress error message in
  elisp-site-file-install if cp source and destination are identical.

Revision  Changes    Path
1.60                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- elisp-common.eclass	8 Apr 2009 10:47:42 -0000	1.59
+++ elisp-common.eclass	14 Apr 2009 15:45:45 -0000	1.60
@@ -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.59 2009/04/08 10:47:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.60 2009/04/14 15:45:45 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -260,7 +260,7 @@
 		|| ewarn "elisp-site-file-install: bad name of site-init file"
 	sf="${T}/${sf/%-gentoo*.el/-gentoo.el}"
 	ebegin "Installing site initialisation file for GNU Emacs"
-	cp "$1" "${sf}"
+	[[ $1 = ${sf} ]] || cp "$1" "${sf}"
 	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
 		-e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
 		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
@@ -284,7 +284,7 @@
 # location is still supported when generating site-gentoo.el.
 
 elisp-site-regen() {
-	local i sf line firstrun obsolete
+	local i sf line obsolete
 	local -a sflist
 
 	if [ ! -d "${ROOT}${SITELISP}" ]; then
@@ -297,28 +297,7 @@
 		return 1
 	fi
 
-	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
-		|| [ "${PN}" = emacs-common-gentoo ] || firstrun=t
-
-	if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
-		einfo "Creating default site-start.el ..."
-		cat <<-EOF >"${T}"/site-start.el
-		;;; site-start.el
-
-		;;; Commentary:
-		;; This default site startup file is installed by elisp-common.eclass.
-		;; You may replace this file by your own site initialisation, or even
-		;; remove it completely; it will not be recreated.
-
-		;;; Code:
-		;; Load site initialisation for Gentoo-installed packages.
-		(require 'site-gentoo)
-
-		;;; site-start.el ends here
-		EOF
-	fi
-
-	einfon "Regenerating site-gentoo.el (${EBUILD_PHASE}) ..."
+	einfon "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE}) ..."
 
 	# Until January 2009, elisp-common.eclass sometimes created an
 	# auxiliary file for backwards compatibility. Remove any such file.
@@ -373,34 +352,10 @@
 		echo " no changes."
 	else
 		mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
-		[ -f "${T}"/site-start.el ] \
-			&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
-			&& mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
 		echo
 		einfo "... ${#sflist[@]} site initialisation file(s) included."
 	fi
 
-	if [ "${firstrun}" ]; then
-		echo
-		while read line; do einfo "${line:- }"; done <<-EOF
-		All site initialisation for Gentoo-installed packages is added to
-		/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is not
-		managed by Gentoo. You are responsible for all maintenance of
-		site-start.el if there is such a file.
-
-		In order for this site initialisation to be loaded for all users
-		automatically, you can add a line like this:
-
-		(require 'site-gentoo)
-
-		to /usr/share/emacs/site-lisp/site-start.el. Alternatively, that line
-		can be added by individual users to their initialisation files, or,
-		for greater flexibility, users can load individual package-specific
-		initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
-		EOF
-		echo
-	fi
-
 	if [ "${obsolete}" ]; then
 		echo
 		while read line; do ewarn "${line}"; done <<-EOF
@@ -412,7 +367,7 @@
 	fi
 
 	# cleanup
-	rm -f "${T}"/site-{gentoo,start}.el
+	rm -f "${T}"/site-gentoo.el
 
 	return 0
 }

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

[Ulrich Mueller (ulm)]

ulm         09/04/08 10:47:43

  Modified:             elisp-common.eclass
  Log:
  Partial sync from Emacs overlay:
  In elisp-site-file-install, allow for extra version identifier in the
  name of the source file; output a warning if the file name doesn't match
  a valid pattern; automagically insert a header comment.

Revision  Changes    Path
1.59                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- elisp-common.eclass	26 Mar 2009 14:14:22 -0000	1.58
+++ elisp-common.eclass	8 Apr 2009 10:47:42 -0000	1.59
@@ -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.58 2009/03/26 14:14:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.59 2009/04/08 10:47:42 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -86,7 +86,7 @@
 # settings.  Give a hint in pkg_postinst(), which should be enough.
 #
 # The naming scheme for this site-init file matches the shell pattern
-# "[1-8][0-9]*-gentoo.el", where the two digits at the beginning define
+# "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define
 # the loading order (numbers below 10 or above 89 are reserved for
 # internal use).  So if your initialisation depends on another Emacs
 # package, your site file's number must be higher!
@@ -100,8 +100,11 @@
 #
 #   	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 #
-# in src_install().  If your subdirectory is not named ${PN}, give the
-# differing name as second argument.
+# in src_install().  Any characters after the "-gentoo" part and before
+# the extension will be stripped from the destination file's name.
+# For example, a file "50${PN}-gentoo-${PV}.el" will be installed as
+# "50${PN}-gentoo.el".  If your subdirectory is not named ${PN}, give
+# the differing name as second argument.
 #
 # .SS
 # pkg_postinst() / pkg_postrm() usage:
@@ -243,13 +246,23 @@
 # @FUNCTION: elisp-site-file-install
 # @USAGE: <site-init file> [subdirectory]
 # @DESCRIPTION:
-# Install Emacs site-init file in SITELISP directory.
+# Install Emacs site-init file in SITELISP directory.  Automatically
+# inserts a standard comment header with the name of the package (unless
+# it is already present).  Tokens @SITELISP@ and @SITEETC@ are replaced
+# by the path to the package's subdirectory in SITELISP and SITEETC,
+# respectively.
 
 elisp-site-file-install() {
-	local sf="${T}/${1##*/}" my_pn="${2:-${PN}}" ret
+	local sf="${1##*/}" my_pn="${2:-${PN}}" ret
+	local header=";;; ${PN} site-lisp configuration"
+
+	[[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \
+		|| ewarn "elisp-site-file-install: bad name of site-init file"
+	sf="${T}/${sf/%-gentoo*.el/-gentoo.el}"
 	ebegin "Installing site initialisation file for GNU Emacs"
 	cp "$1" "${sf}"
-	sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
+	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
+		-e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
 		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/site-gentoo.d"

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

[Ulrich Mueller (ulm)]

ulm         09/03/12 14:10:48

  Modified:             elisp-common.eclass
  Log:
  Don't create site-start.el if we are called from emacs-common-gentoo.

Revision  Changes    Path
1.57                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- elisp-common.eclass	12 Mar 2009 12:08:47 -0000	1.56
+++ elisp-common.eclass	12 Mar 2009 14:10:48 -0000	1.57
@@ -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.56 2009/03/12 12:08:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.57 2009/03/12 14:10:48 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -324,7 +324,8 @@
 		return 1
 	fi
 
-	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t
+	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
+		|| [ "${PN}" = emacs-common-gentoo ] || firstrun=t
 
 	if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
 		einfo "Creating default site-start.el ..."

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

[Ulrich Mueller (ulm)]

ulm         09/02/13 17:15:59

  Modified:             elisp-common.eclass
  Log:
  Remove workaround for T; Paludis bug #517 was fixed 12 months ago.

Revision  Changes    Path
1.55                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- elisp-common.eclass	31 Jan 2009 21:31:42 -0000	1.54
+++ elisp-common.eclass	13 Feb 2009 17:15:58 -0000	1.55
@@ -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.54 2009/01/31 21:31:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.55 2009/02/13 17:15:58 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -313,19 +313,22 @@
 elisp-site-regen() {
 	local i sf line firstrun obsolete
 	local -a sflist
-	# Work around Paludis borkage: variable T is empty in pkg_postrm
-	local tmpdir=${T:-$(mktemp -d)}
 
 	if [ ! -d "${ROOT}${SITELISP}" ]; then
 		eerror "elisp-site-regen: Directory ${SITELISP} does not exist"
 		return 1
 	fi
 
+	if [ ! -d "${T}" ]; then
+		eerror "elisp-site-regen: Temporary directory ${T} does not exist"
+		return 1
+	fi
+
 	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t
 
 	if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
 		einfo "Creating default ${SITELISP}/site-start.el ..."
-		cat <<-EOF >"${tmpdir}"/site-start.el
+		cat <<-EOF >"${T}"/site-start.el
 		;;; site-start.el
 
 		;;; Commentary:
@@ -366,7 +369,7 @@
 
 	eval "${old_shopts}"
 
-	cat <<-EOF >"${tmpdir}"/site-gentoo.el
+	cat <<-EOF >"${T}"/site-gentoo.el
 	;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
 
 	;;; Commentary:
@@ -376,8 +379,8 @@
 	;;; Code:
 	EOF
 	# Use sed instead of cat here, since files may miss a trailing newline.
-	sed '$q' "${sflist[@]}" </dev/null >>"${tmpdir}"/site-gentoo.el
-	cat <<-EOF >>"${tmpdir}"/site-gentoo.el
+	sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el
+	cat <<-EOF >>"${T}"/site-gentoo.el
 
 	(provide 'site-gentoo)
 
@@ -387,17 +390,17 @@
 	;;; site-gentoo.el ends here
 	EOF
 
-	if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${tmpdir}"/site-gentoo.el
+	if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${T}"/site-gentoo.el
 	then
 		# This prevents outputting unnecessary text when there
 		# was actually no change.
 		# A case is a remerge where we have doubled output.
 		echo " no changes."
 	else
-		mv "${tmpdir}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
-		[ -f "${tmpdir}"/site-start.el ] \
+		mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
+		[ -f "${T}"/site-start.el ] \
 			&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
-			&& mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
+			&& mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
 		echo
 		einfo "... ${#sflist[@]} site initialisation file(s) included."
 	fi
@@ -434,7 +437,7 @@
 	fi
 
 	# cleanup
-	rm -f "${tmpdir}"/site-{gentoo,start}.el
+	rm -f "${T}"/site-{gentoo,start}.el
 
 	return 0
 }

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

[Ulrich Mueller (ulm)]

ulm         09/01/31 21:31:42

  Modified:             elisp-common.eclass
  Log:
  Update copyright years.

Revision  Changes    Path
1.54                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- elisp-common.eclass	31 Jan 2009 20:58:31 -0000	1.53
+++ elisp-common.eclass	31 Jan 2009 21:31:42 -0000	1.54
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.53 2009/01/31 20:58:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.54 2009/01/31 21:31:42 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 <opfer@gentoo.org>
-# Copyright 2007-2008 Ulrich Müller <ulm@gentoo.org>
+# Copyright 2007-2009 Ulrich Müller <ulm@gentoo.org>
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:

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

[Ulrich Mueller (ulm)]

ulm         09/01/31 20:58:31

  Modified:             elisp-common.eclass
  Log:
  Remove backwards compatibility kludge (after 13 months transition time).

Revision  Changes    Path
1.53                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- elisp-common.eclass	24 Nov 2008 14:21:04 -0000	1.52
+++ elisp-common.eclass	31 Jan 2009 20:58:31 -0000	1.53
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.52 2008/11/24 14:21:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.53 2009/01/31 20:58:31 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -431,15 +431,6 @@
 		that you use app-admin/emacs-updater to rebuild the installed
 		Emacs packages.
 		EOF
-
-		# Kludge for backwards compatibility: During pkg_postrm, old versions
-		# of this eclass (saved in the VDB) won't find packages' site-init
-		# files in the new location. So we copy them to an auxiliary file
-		# that is visible to old eclass versions.
-		for sf in "${sflist[@]}"; do
-			[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
-				&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
-		done
 	fi
 
 	# cleanup

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

[Ulrich Mueller (ulm)]

ulm         08/11/24 14:21:04

  Modified:             elisp-common.eclass
  Log:
  Terminate last line of init file.

Revision  Changes    Path
1.52                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- elisp-common.eclass	27 Oct 2008 21:34:34 -0000	1.51
+++ elisp-common.eclass	24 Nov 2008 14:21:04 -0000	1.52
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.51 2008/10/27 21:34:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.52 2008/11/24 14:21:04 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -291,7 +291,7 @@
 	ebegin "Installing site initialisation file for GNU Emacs"
 	cp "$1" "${sf}"
 	sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
-		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${sf}"
+		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/site-gentoo.d"
 		doins "${sf}"

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

[Ulrich Mueller (ulm)]

ulm         08/10/27 21:34:34

  Modified:             elisp-common.eclass
  Log:
  Don't assign a default to SITEFILE, since elisp-common.eclass doesn't use it.

Revision  Changes    Path
1.51                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- elisp-common.eclass	16 Oct 2008 09:28:58 -0000	1.50
+++ elisp-common.eclass	27 Oct 2008 21:34:34 -0000	1.51
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.50 2008/10/16 09:28:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.51 2008/10/27 21:34:34 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -139,11 +139,6 @@
 # Directory where packages install miscellaneous (not Lisp) files.
 SITEETC=/usr/share/emacs/etc
 
-# @ECLASS-VARIABLE: SITEFILE
-# @DESCRIPTION:
-# Name of package's site-init file.
-SITEFILE=50${PN}-gentoo.el
-
 # @ECLASS-VARIABLE: EMACS
 # @DESCRIPTION:
 # Path of Emacs executable.

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

[Ulrich Mueller (ulm)]

ulm         08/10/12 19:48:21

  Modified:             elisp-common.eclass
  Log:
  Add function names to error messages.

Revision  Changes    Path
1.49                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- elisp-common.eclass	5 Oct 2008 13:56:08 -0000	1.48
+++ elisp-common.eclass	12 Oct 2008 19:48:21 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.48 2008/10/05 13:56:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.49 2008/10/12 19:48:21 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -174,7 +174,7 @@
 elisp-compile() {
 	ebegin "Compiling GNU Emacs Elisp files"
 	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
-	eend $? "batch-byte-compile failed"
+	eend $? "elisp-compile: batch-byte-compile failed"
 }
 
 # #FUNCTION: elisp-comp
@@ -219,8 +219,7 @@
 	popd
 	rm -fr ${tempdir}
 
-	eend ${ret} "batch-byte-compile failed"
-	return ${ret}
+	eend ${ret} "elisp-comp: batch-byte-compile failed"
 }
 
 # @FUNCTION: elisp-emacs-version
@@ -266,7 +265,7 @@
 		--eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \
 		-f batch-update-autoloads "${@-.}"
 
-	eend $? "batch-update-autoloads failed"
+	eend $? "elisp-make-autoload-file: batch-update-autoloads failed"
 }
 
 # @FUNCTION: elisp-install
@@ -282,7 +281,7 @@
 		insinto "${SITELISP}/${subdir}"
 		doins "$@"
 	)
-	eend $? "doins failed"
+	eend $? "elisp-install: doins failed"
 }
 
 # @FUNCTION: elisp-site-file-install
@@ -302,7 +301,7 @@
 	)
 	ret=$?
 	rm -f "${sf}"
-	eend ${ret} "doins failed"
+	eend ${ret} "elisp-site-file-install: doins failed"
 }
 
 # @FUNCTION: elisp-site-regen
@@ -321,7 +320,7 @@
 	local tmpdir=${T:-$(mktemp -d)}
 
 	if [ ! -d "${ROOT}${SITELISP}" ]; then
-		eerror "Directory ${SITELISP} does not exist"
+		eerror "elisp-site-regen: Directory ${SITELISP} does not exist"
 		return 1
 	fi
 

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

[Ulrich Mueller (ulm)]

ulm         08/10/05 13:56:09

  Modified:             elisp-common.eclass
  Log:
  Document SITEETC as eclass variable. Update comment for elisp-site-regen.

Revision  Changes    Path
1.48                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- elisp-common.eclass	24 Sep 2008 09:47:04 -0000	1.47
+++ elisp-common.eclass	5 Oct 2008 13:56:08 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.47 2008/09/24 09:47:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.48 2008/10/05 13:56:08 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -132,6 +132,8 @@
 # Directory where packages install Emacs Lisp files.
 SITELISP=/usr/share/emacs/site-lisp
 
+# @ECLASS-VARIABLE: SITEETC
+# @DESCRIPTION:
 # Directory where packages install miscellaneous (not Lisp) files.
 SITEETC=/usr/share/emacs/etc
 
@@ -305,11 +307,12 @@
 
 # @FUNCTION: elisp-site-regen
 # @DESCRIPTION:
-# Regenerate site-gentoo.el file.  The old location for site initialisation
-# files of packages was /usr/share/emacs/site-lisp/.  In December 2007 this
-# has been changed to /usr/share/emacs/site-lisp/site-gentoo.d/.  Remerge of
-# packages with Emacs support is enough, the old location is still supported
-# when generating the start-up file.
+# Regenerate the site-gentoo.el file, based on packages' site initialisation
+# files in the /usr/share/emacs/site-lisp/site-gentoo.d/ directory.
+#
+# Note: Before December 2007, site initialisation files were installed in
+# /usr/share/emacs/site-lisp/.  For backwards compatibility, this location is
+# still supported when generating site-gentoo.el.
 
 elisp-site-regen() {
 	local i sf line firstrun obsolete

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

[Ulrich Mueller (ulm)]

ulm         08/09/24 09:47:04

  Modified:             elisp-common.eclass
  Log:
  Be less verbose, bug 237546.

Revision  Changes    Path
1.47                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- elisp-common.eclass	19 Sep 2008 08:12:48 -0000	1.46
+++ elisp-common.eclass	24 Sep 2008 09:47:04 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.46 2008/09/19 08:12:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.47 2008/09/24 09:47:04 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -312,7 +312,7 @@
 # when generating the start-up file.
 
 elisp-site-regen() {
-	local i sf line obsolete
+	local i sf line firstrun obsolete
 	local -a sflist
 	# Work around Paludis borkage: variable T is empty in pkg_postrm
 	local tmpdir=${T:-$(mktemp -d)}
@@ -322,8 +322,9 @@
 		return 1
 	fi
 
-	if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
-		&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
+	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t
+
+	if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
 		einfo "Creating default ${SITELISP}/site-start.el ..."
 		cat <<-EOF >"${tmpdir}"/site-start.el
 		;;; site-start.el
@@ -398,11 +399,10 @@
 			&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
 			&& mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
 		echo
-		for sf in "${sflist[@]##*/}"; do
-			einfo "  Adding ${sf} ..."
-		done
-		einfo "Regenerated ${SITELISP}/site-gentoo.el."
+		einfo "... ${#sflist[@]} site initialisation file(s) included."
+	fi
 
+	if [ "${firstrun}" ]; then
 		echo
 		while read line; do einfo "${line:- }"; done <<-EOF
 		All site initialisation for Gentoo-installed packages is added to

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

[Ulrich Mueller (ulm)]

ulm         08/09/01 10:45:26

  Modified:             elisp-common.eclass
  Log:
  Return definite status from elisp-site-regen.

Revision  Changes    Path
1.45                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- elisp-common.eclass	27 Aug 2008 11:21:32 -0000	1.44
+++ elisp-common.eclass	1 Sep 2008 10:45:26 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.44 2008/08/27 11:21:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.45 2008/09/01 10:45:26 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -198,7 +198,7 @@
 
 	ebegin "Compiling GNU Emacs Elisp files"
 
-	tempdir=elc.$$
+	local tempdir=elc.$$
 	mkdir ${tempdir}
 	cp "$@" ${tempdir}
 	pushd ${tempdir}
@@ -438,4 +438,6 @@
 
 	# cleanup
 	rm -f "${tmpdir}"/site-{gentoo,start}.el
+
+	return 0
 }

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

[Ulrich Mueller (ulm)]

ulm         08/08/27 11:21:33

  Modified:             elisp-common.eclass
  Log:
  Remove elisp-comp from eclass man page.

Revision  Changes    Path
1.44                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- elisp-common.eclass	27 Aug 2008 06:53:41 -0000	1.43
+++ elisp-common.eclass	27 Aug 2008 11:21:32 -0000	1.44
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.43 2008/08/27 06:53:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.44 2008/08/27 11:21:32 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -175,9 +175,9 @@
 	eend $? "batch-byte-compile failed"
 }
 
-# @FUNCTION: elisp-comp
-# @USAGE: <list of elisp files>
-# @DESCRIPTION:
+# #FUNCTION: elisp-comp
+# #USAGE: <list of elisp files>
+# #DESCRIPTION:
 # Byte-compile interdependent Emacs Lisp files.
 #
 # This function byte-compiles all ".el" files which are part of its

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

[Ulrich Mueller (ulm)]

ulm         08/08/27 06:53:42

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 1137).
  
  elisp-common.eclass:
  Add current directory to load-path in elisp-compile.
  New variable BYTECOMPFLAGS.
  Document EMACS and EMACSFLAGS as eclass variables.

Revision  Changes    Path
1.43                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- elisp-common.eclass	10 Aug 2008 16:54:22 -0000	1.42
+++ elisp-common.eclass	27 Aug 2008 06:53:41 -0000	1.43
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.42 2008/08/10 16:54:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.43 2008/08/27 06:53:41 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -33,20 +33,20 @@
 # src_compile() usage:
 #
 # An elisp file is compiled by the elisp-compile() function defined here and
-# simply takes the source files as arguments.
+# simply takes the source files as arguments.  The case of interdependent
+# elisp files is also supported, since the current directory is added to the
+# load-path which makes sure that all files are loadable.
 #
 #   	elisp-compile *.el || die "elisp-compile failed"
 #
-# In the case of interdependent elisp files, you can use the elisp-comp()
-# function which makes sure all files are loadable.
-#
-#   	elisp-comp *.el || die "elisp-comp failed"
+# Formerly, function elisp-comp() was used for compilation of interdependent
+# elisp files.  This usage is considered as obsolete.
 #
 # Function elisp-make-autoload-file() can be used to generate a file with
 # autoload definitions for the lisp functions.  It takes the output file name
 # (default: "${PN}-autoloads.el") and a list of directories (default: working
 # directory) as its arguments.  Use of this function requires that the elisp
-# source files contain magic ";;;###autoload" comments. See the Emacs Lisp
+# source files contain magic ";;;###autoload" comments.  See the Emacs Lisp
 # Reference Manual (node "Autoload") for a detailed explanation.
 #
 # .SS
@@ -140,18 +140,38 @@
 # Name of package's site-init file.
 SITEFILE=50${PN}-gentoo.el
 
+# @ECLASS-VARIABLE: EMACS
+# @DESCRIPTION:
+# Path of Emacs executable.
 EMACS=/usr/bin/emacs
-# The following works for Emacs versions 18-23, don't change it.
+
+# @ECLASS-VARIABLE: EMACSFLAGS
+# @DESCRIPTION:
+# Flags for executing Emacs in batch mode.
+# These work for Emacs versions 18-23, so don't change them.
 EMACSFLAGS="-batch -q --no-site-file"
 
+# @ECLASS-VARIABLE: BYTECOMPFLAGS
+# @DESCRIPTION:
+# Emacs flags used for byte-compilation in elisp-compile().
+BYTECOMPFLAGS="-L ."
+
 # @FUNCTION: elisp-compile
 # @USAGE: <list of elisp files>
 # @DESCRIPTION:
 # Byte-compile Emacs Lisp files.
+#
+# This function uses GNU Emacs to byte-compile all ".el" specified by its
+# arguments.  The resulting byte-code (".elc") files are placed in the same
+# directory as their corresponding source file.
+#
+# The current directory is added to the load-path.  This will ensure that
+# interdependent Emacs Lisp files are visible between themselves, in case
+# they require or load one another.
 
 elisp-compile() {
 	ebegin "Compiling GNU Emacs Elisp files"
-	${EMACS} ${EMACSFLAGS} -f batch-byte-compile "$@"
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
 	eend $? "batch-byte-compile failed"
 }
 

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

[Ulrich Mueller (ulm)]

ulm         08/08/10 16:54:23

  Modified:             elisp-common.eclass
  Log:
  Fix issue with empty einfo lines in elisp-site-regen. Indent here-document.
  Change wording of message, "no longer" -> "not", since the underlying change
  from site-start.el to site-gentoo.el was in 2004.

Revision  Changes    Path
1.42                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elisp-common.eclass	1 Jul 2008 22:10:06 -0000	1.41
+++ elisp-common.eclass	10 Aug 2008 16:54:22 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.41 2008/07/01 22:10:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.42 2008/08/10 16:54:22 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -378,22 +378,22 @@
 		einfo "Regenerated ${SITELISP}/site-gentoo.el."
 
 		echo
-		while read line; do einfo "${line}"; done <<EOF
-All site initialisation for Gentoo-installed packages is added to
-/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer
-managed by Gentoo.  You are responsible for all maintenance of
-site-start.el if there is such a file.
-
-In order for this site initialisation to be loaded for all users
-automatically, you can add a line like this:
-
-	(require 'site-gentoo)
-
-to /usr/share/emacs/site-lisp/site-start.el.  Alternatively, that line
-can be added by individual users to their initialisation files, or,
-for greater flexibility, users can load individual package-specific
-initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
-EOF
+		while read line; do einfo "${line:- }"; done <<-EOF
+		All site initialisation for Gentoo-installed packages is added to
+		/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is not
+		managed by Gentoo. You are responsible for all maintenance of
+		site-start.el if there is such a file.
+
+		In order for this site initialisation to be loaded for all users
+		automatically, you can add a line like this:
+
+		(require 'site-gentoo)
+
+		to /usr/share/emacs/site-lisp/site-start.el. Alternatively, that line
+		can be added by individual users to their initialisation files, or,
+		for greater flexibility, users can load individual package-specific
+		initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
+		EOF
 		echo
 	fi
 

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

[Ulrich Mueller (ulm)]

ulm         08/07/01 22:10:07

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 1110).
  
  elisp-common.eclass:
  Create file for backwards compatibility only if obsolete files were found.

Revision  Changes    Path
1.41                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- elisp-common.eclass	18 May 2008 06:15:12 -0000	1.40
+++ elisp-common.eclass	1 Jul 2008 22:10:06 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.40 2008/05/18 06:15:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.41 2008/07/01 22:10:06 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -317,7 +317,7 @@
 
 	einfon "Regenerating ${SITELISP}/site-gentoo.el ..."
 
-	# remove auxiliary file
+	# remove any auxiliary file (from previous run)
 	rm -f "${ROOT}${SITELISP}"/00site-gentoo.el
 
 	# set nullglob option, there may be a directory without matching files
@@ -395,26 +395,26 @@
 initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
 EOF
 		echo
-
-		if [ "${obsolete}" ]; then
-			while read line; do ewarn "${line}"; done <<-EOF
-			Site-initialisation files of Emacs packages are now installed in
-			/usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
-			that you use /usr/sbin/emacs-updater to rebuild the installed
-			Emacs packages.
-			EOF
-			echo
-		fi
 	fi
 
-	# Kludge for backwards compatibility: During pkg_postrm, old versions
-	# of this eclass (saved in the VDB) won't find packages' site-init files
-	# in the new location. So we copy them to an auxiliary file that is
-	# visible to old eclass versions.
-	for sf in "${sflist[@]}"; do
-		[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
-			&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
-	done
+	if [ "${obsolete}" ]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Site-initialisation files of Emacs packages are now installed in
+		/usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
+		that you use /usr/sbin/emacs-updater to rebuild the installed
+		Emacs packages.
+		EOF
+		echo
+
+		# Kludge for backwards compatibility: During pkg_postrm, old versions
+		# of this eclass (saved in the VDB) won't find packages' site-init
+		# files in the new location. So we copy them to an auxiliary file
+		# that is visible to old eclass versions.
+		for sf in "${sflist[@]}"; do
+			[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
+				&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
+		done
+	fi
 
 	# cleanup
 	rm -f "${tmpdir}"/site-{gentoo,start}.el



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/05/18 06:15:12

  Modified:             elisp-common.eclass
  Log:
  Change wording of obsoletion warning.

Revision  Changes    Path
1.40                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elisp-common.eclass	12 Apr 2008 08:40:46 -0000	1.39
+++ elisp-common.eclass	18 May 2008 06:15:12 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.39 2008/04/12 08:40:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.40 2008/05/18 06:15:12 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -399,9 +399,9 @@
 		if [ "${obsolete}" ]; then
 			while read line; do ewarn "${line}"; done <<-EOF
 			Site-initialisation files of Emacs packages are now installed in
-			/usr/share/emacs/site-lisp/site-gentoo.d/. You may consider using
-			/usr/sbin/emacs-updater to rebuild the installed Emacs packages.
-			However, the old location is still supported.
+			/usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
+			that you use /usr/sbin/emacs-updater to rebuild the installed
+			Emacs packages.
 			EOF
 			echo
 		fi



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/04/12 08:40:47

  Modified:             elisp-common.eclass
  Log:
  Create temporary directory safely.

Revision  Changes    Path
1.39                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- elisp-common.eclass	4 Apr 2008 18:11:28 -0000	1.38
+++ elisp-common.eclass	12 Apr 2008 08:40:46 -0000	1.39
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.38 2008/04/04 18:11:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.39 2008/04/12 08:40:46 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -289,7 +289,7 @@
 	local i sf line obsolete
 	local -a sflist
 	# Work around Paludis borkage: variable T is empty in pkg_postrm
-	local tmpdir=${T:-/tmp}
+	local tmpdir=${T:-$(mktemp -d)}
 
 	if [ ! -d "${ROOT}${SITELISP}" ]; then
 		eerror "Directory ${SITELISP} does not exist"



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/04/04 18:11:29

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 1041).
  
  elisp-common.eclass:
  Check if the SITELISP directory exists.

Revision  Changes    Path
1.38                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- elisp-common.eclass	7 Mar 2008 08:19:19 -0000	1.37
+++ elisp-common.eclass	4 Apr 2008 18:11:28 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.37 2008/03/07 08:19:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.38 2008/04/04 18:11:28 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -141,7 +141,7 @@
 SITEFILE=50${PN}-gentoo.el
 
 EMACS=/usr/bin/emacs
-# The following works for Emacs versions 18--23, don't change it.
+# The following works for Emacs versions 18-23, don't change it.
 EMACSFLAGS="-batch -q --no-site-file"
 
 # @FUNCTION: elisp-compile
@@ -200,7 +200,7 @@
 # Output version of currently active Emacs.
 
 elisp-emacs-version() {
-	# The following will work for at least versions 18--23.
+	# The following will work for at least versions 18-23.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
 	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
 	rm -f "${T}"/emacs-version.el
@@ -288,8 +288,14 @@
 elisp-site-regen() {
 	local i sf line obsolete
 	local -a sflist
+	# Work around Paludis borkage: variable T is empty in pkg_postrm
 	local tmpdir=${T:-/tmp}
 
+	if [ ! -d "${ROOT}${SITELISP}" ]; then
+		eerror "Directory ${SITELISP} does not exist"
+		return 1
+	fi
+
 	if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
 		&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
 		einfo "Creating default ${SITELISP}/site-start.el ..."



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/03/07 08:19:19

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 1012).
  
  elisp-common.eclass:
  Work around Paludis borkage, where variable T is empty in pkg_postrm.
  Clean up temporary files.

Revision  Changes    Path
1.37                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- elisp-common.eclass	22 Feb 2008 09:30:40 -0000	1.36
+++ elisp-common.eclass	7 Mar 2008 08:19:19 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.36 2008/02/22 09:30:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.37 2008/03/07 08:19:19 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -203,6 +203,7 @@
 	# The following will work for at least versions 18--23.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
 	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
+	rm -f "${T}"/emacs-version.el
 }
 
 # @FUNCTION: elisp-make-autoload-file
@@ -262,16 +263,18 @@
 # Install Emacs site-init file in SITELISP directory.
 
 elisp-site-file-install() {
-	local sf="${1##*/}" my_pn="${2:-${PN}}"
+	local sf="${T}/${1##*/}" my_pn="${2:-${PN}}" ret
 	ebegin "Installing site initialisation file for GNU Emacs"
-	cp "$1" "${T}/${sf}"
+	cp "$1" "${sf}"
 	sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
-		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${T}/${sf}"
+		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${sf}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/site-gentoo.d"
-		doins "${T}/${sf}"
+		doins "${sf}"
 	)
-	eend $? "doins failed"
+	ret=$?
+	rm -f "${sf}"
+	eend ${ret} "doins failed"
 }
 
 # @FUNCTION: elisp-site-regen
@@ -285,11 +288,12 @@
 elisp-site-regen() {
 	local i sf line obsolete
 	local -a sflist
+	local tmpdir=${T:-/tmp}
 
 	if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
 		&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
 		einfo "Creating default ${SITELISP}/site-start.el ..."
-		cat <<-EOF >"${T}"/site-start.el
+		cat <<-EOF >"${tmpdir}"/site-start.el
 		;;; site-start.el
 
 		;;; Commentary:
@@ -330,7 +334,7 @@
 
 	eval "${old_shopts}"
 
-	cat <<-EOF >"${T}"/site-gentoo.el
+	cat <<-EOF >"${tmpdir}"/site-gentoo.el
 	;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
 
 	;;; Commentary:
@@ -339,8 +343,8 @@
 
 	;;; Code:
 	EOF
-	cat "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el
-	cat <<-EOF >>"${T}"/site-gentoo.el
+	cat "${sflist[@]}" </dev/null >>"${tmpdir}"/site-gentoo.el
+	cat <<-EOF >>"${tmpdir}"/site-gentoo.el
 
 	(provide 'site-gentoo)
 
@@ -350,16 +354,17 @@
 	;;; site-gentoo.el ends here
 	EOF
 
-	if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${T}"/site-gentoo.el; then
+	if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${tmpdir}"/site-gentoo.el
+	then
 		# This prevents outputting unnecessary text when there
 		# was actually no change.
 		# A case is a remerge where we have doubled output.
 		echo " no changes."
 	else
-		mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
-		[ -f "${T}"/site-start.el ] \
+		mv "${tmpdir}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
+		[ -f "${tmpdir}"/site-start.el ] \
 			&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
-			&& mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
+			&& mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
 		echo; einfo
 		for sf in "${sflist[@]##*/}"; do
 			einfo "  Adding ${sf} ..."
@@ -404,4 +409,7 @@
 		[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
 			&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
 	done
+
+	# cleanup
+	rm -f "${tmpdir}"/site-{gentoo,start}.el
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/02/22 09:30:41

  Modified:             elisp-common.eclass
  Log:
  Update copyright years.

Revision  Changes    Path
1.36                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- elisp-common.eclass	22 Feb 2008 09:28:53 -0000	1.35
+++ elisp-common.eclass	22 Feb 2008 09:30:40 -0000	1.36
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.35 2008/02/22 09:28:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.36 2008/02/22 09:30:40 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         08/02/22 09:28:54

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 967).
  
  elisp-common.eclass:
  Enable warning message about obsolete files.

Revision  Changes    Path
1.35                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- elisp-common.eclass	28 Dec 2007 17:48:34 -0000	1.34
+++ elisp-common.eclass	22 Feb 2008 09:28:53 -0000	1.35
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.34 2007/12/28 17:48:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.35 2008/02/22 09:28:53 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
-# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
+# Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
 # Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org>
-# Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
-# Copyright 2007 Ulrich Mueller <ulm@gentoo.org>
+# Copyright 2007-2008 Christian Faulhammer <opfer@gentoo.org>
+# Copyright 2007-2008 Ulrich Müller <ulm@gentoo.org>
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -384,6 +384,16 @@
 initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
 EOF
 		echo
+
+		if [ "${obsolete}" ]; then
+			while read line; do ewarn "${line}"; done <<-EOF
+			Site-initialisation files of Emacs packages are now installed in
+			/usr/share/emacs/site-lisp/site-gentoo.d/. You may consider using
+			/usr/sbin/emacs-updater to rebuild the installed Emacs packages.
+			However, the old location is still supported.
+			EOF
+			echo
+		fi
 	fi
 
 	# Kludge for backwards compatibility: During pkg_postrm, old versions
@@ -394,14 +404,4 @@
 		[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
 			&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
 	done
-
-#	if [ "${obsolete}" ]; then
-#		while read line; do ewarn "${line}"; done <<-EOF
-#		Site-initialisation files of Emacs packages are now installed in
-#		/usr/share/emacs/site-lisp/site-gentoo.d/. You may consider using
-#		/usr/sbin/emacs-updater to rebuild the installed Emacs packages.
-#		However, the old location is still supported.
-#		EOF
-#		echo
-#	fi
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         07/12/12 21:58:58

  Modified:             elisp-common.eclass
  Log:
  Redirect input for cat command to /dev/null, otherwise it will hang if the list
  of files is empty. Thanks to bicatali for pointing this out.

Revision  Changes    Path
1.33                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- elisp-common.eclass	11 Dec 2007 12:28:05 -0000	1.32
+++ elisp-common.eclass	12 Dec 2007 21:58:57 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.32 2007/12/11 12:28:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.33 2007/12/12 21:58:57 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
@@ -337,7 +337,7 @@
 
 	;;; Code:
 	EOF
-	cat "${sflist[@]}" >>"${T}"/site-gentoo.el
+	cat "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el
 	cat <<-EOF >>"${T}"/site-gentoo.el
 
 	(provide 'site-gentoo)



-- 
gentoo-commits@gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         07/12/11 12:28:06

  Modified:             elisp-common.eclass
  Log:
  Partial sync from Emacs overlay:
  Prepare for migration of packages' site files to site-gentoo.d subdirectory.
  Use bash arrays and a custom sort routine in elisp-site-regen.
  Set nullglob option, because there may be a directory without matching files.
  Use ebegin/eend instead of einfo where it is feasible.

Revision  Changes    Path
1.32                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- elisp-common.eclass	1 Dec 2007 15:35:02 -0000	1.31
+++ elisp-common.eclass	11 Dec 2007 12:28:05 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.31 2007/12/01 15:35:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.32 2007/12/11 12:28:05 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
@@ -150,8 +150,9 @@
 # Byte-compile Emacs Lisp files.
 
 elisp-compile() {
-	einfo "Compiling GNU Emacs Elisp files ..."
+	ebegin "Compiling GNU Emacs Elisp files"
 	${EMACS} ${EMACSFLAGS} -f batch-byte-compile "$@"
+	eend $? "batch-byte-compile failed"
 }
 
 # @FUNCTION: elisp-comp
@@ -175,7 +176,7 @@
 
 	[ $# -gt 0 ] || return 1
 
-	einfo "Compiling GNU Emacs Elisp files ..."
+	ebegin "Compiling GNU Emacs Elisp files"
 
 	tempdir=elc.$$
 	mkdir ${tempdir}
@@ -189,6 +190,8 @@
 
 	popd
 	rm -fr ${tempdir}
+
+	eend ${ret} "batch-byte-compile failed"
 	return ${ret}
 }
 
@@ -210,7 +213,7 @@
 elisp-make-autoload-file() {
 	local f="${1:-${PN}-autoloads.el}"
 	shift
-	einfo "Generating autoload file for GNU Emacs ..."
+	ebegin "Generating autoload file for GNU Emacs"
 
 	sed 's/^FF/\f/' >"${f}" <<-EOF
 	;;; ${f##*/} --- autoloads for ${P}
@@ -233,6 +236,8 @@
 		--eval "(setq make-backup-files nil)" \
 		--eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \
 		-f batch-update-autoloads "${@-.}"
+
+	eend $? "batch-update-autoloads failed"
 }
 
 # @FUNCTION: elisp-install
@@ -243,11 +248,12 @@
 elisp-install() {
 	local subdir="$1"
 	shift
-	einfo "Installing Elisp files for GNU Emacs support ..."
+	ebegin "Installing Elisp files for GNU Emacs support"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/${subdir}"
 		doins "$@"
 	)
+	eend $? "doins failed"
 }
 
 # @FUNCTION: elisp-site-file-install
@@ -257,7 +263,7 @@
 
 elisp-site-file-install() {
 	local sf="$1" my_pn="${2:-${PN}}"
-	einfo "Installing site initialisation file for GNU Emacs ..."
+	ebegin "Installing site initialisation file for GNU Emacs"
 	cp "${sf}" "${T}"
 	sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
 		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${T}/${sf##*/}"
@@ -265,14 +271,20 @@
 		insinto "${SITELISP}"
 		doins "${T}/${sf##*/}"
 	)
+	eend $? "doins failed"
 }
 
 # @FUNCTION: elisp-site-regen
 # @DESCRIPTION:
 # Regenerate site-gentoo.el file.
 
+# Old location for site initialisation files of packages was
+# /usr/share/emacs/site-lisp/.  It is planned to change this to
+# /usr/share/emacs/site-lisp/site-gentoo.d/.
+
 elisp-site-regen() {
-	local sflist sf line
+	local i sf line
+	local -a sflist
 
 	if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
 		&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
@@ -294,6 +306,28 @@
 	fi
 
 	einfon "Regenerating ${SITELISP}/site-gentoo.el ..."
+
+	# remove auxiliary file
+	rm -f "${ROOT}${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 "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el \
+		"${ROOT}${SITELISP}"/site-gentoo.d/[0-9][0-9]*.el
+	do
+		[ -r "${sf}" ] || continue
+		# sort files by their basename. straight insertion sort.
+		for ((i=${#sflist[@]}; i>0; i--)); do
+			[[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break
+			sflist[i]=${sflist[i-1]}
+		done
+		sflist[i]=${sf}
+	done
+
+	eval "${old_shopts}"
+
 	cat <<-EOF >"${T}"/site-gentoo.el
 	;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
 
@@ -303,14 +337,7 @@
 
 	;;; Code:
 	EOF
-
-	for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
-	do
-		[ -r "${sf}" ] || continue
-		sflist="${sflist} ${sf##*/}"
-		cat "${sf}" >>"${T}"/site-gentoo.el
-	done
-
+	cat "${sflist[@]}" >>"${T}"/site-gentoo.el
 	cat <<-EOF >>"${T}"/site-gentoo.el
 
 	(provide 'site-gentoo)
@@ -332,11 +359,13 @@
 			&& [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
 			&& mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
 		echo; einfo
-		for sf in ${sflist}; do
+		for sf in "${sflist[@]##*/}"; do
 			einfo "  Adding ${sf} ..."
 		done
-		while read line; do einfo "${line}"; done <<EOF
+		einfo "Regenerated ${SITELISP}/site-gentoo.el."
 
+		echo
+		while read line; do einfo "${line}"; done <<EOF
 All site initialisation for Gentoo-installed packages is added to
 /usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer
 managed by Gentoo.  You are responsible for all maintenance of
@@ -354,4 +383,13 @@
 EOF
 		echo
 	fi
+
+	# Kludge for backwards compatibility: During pkg_postrm, old versions
+	# of this eclass (saved in the PDB) won't find packages' site-init files
+	# in the new location. So we copy them to an auxiliary file that is
+	# visible to old eclass versions.
+	for sf in "${sflist[@]}"; do
+		[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
+			&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
+	done
 }



-- 
gentoo-commits@gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         07/12/01 15:35:02

  Modified:             elisp-common.eclass
  Log:
  Partial sync from Emacs overlay:
  New variable SITEETC.
  Replace basename by bash parameter expansion.

Revision  Changes    Path
1.31                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- elisp-common.eclass	17 Nov 2007 15:39:35 -0000	1.30
+++ elisp-common.eclass	1 Dec 2007 15:35:02 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.30 2007/11/17 15:39:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.31 2007/12/01 15:35:02 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
@@ -129,9 +129,12 @@
 
 # @ECLASS-VARIABLE: SITELISP
 # @DESCRIPTION:
-# Directory where Emacs Lisp files are installed.
+# Directory where packages install Emacs Lisp files.
 SITELISP=/usr/share/emacs/site-lisp
 
+# Directory where packages install miscellaneous (not Lisp) files.
+SITEETC=/usr/share/emacs/etc
+
 # @ECLASS-VARIABLE: SITEFILE
 # @DESCRIPTION:
 # Name of package's site-init file.
@@ -256,10 +259,11 @@
 	local sf="$1" my_pn="${2:-${PN}}"
 	einfo "Installing site initialisation file for GNU Emacs ..."
 	cp "${sf}" "${T}"
-	sed -i "s:@SITELISP@:${SITELISP}/${my_pn}:g" "${T}/$(basename "${sf}")"
+	sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
+		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${T}/${sf##*/}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}"
-		doins "${T}/$(basename "${sf}")"
+		doins "${T}/${sf##*/}"
 	)
 }
 
@@ -303,7 +307,7 @@
 	for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
 	do
 		[ -r "${sf}" ] || continue
-		sflist="${sflist} $(basename "${sf}")"
+		sflist="${sflist} ${sf##*/}"
 		cat "${sf}" >>"${T}"/site-gentoo.el
 	done
 
@@ -335,7 +339,7 @@
 
 All site initialisation for Gentoo-installed packages is added to
 /usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer
-managed by Gentoo. You are responsible for all maintenance of
+managed by Gentoo.  You are responsible for all maintenance of
 site-start.el if there is such a file.
 
 In order for this site initialisation to be loaded for all users
@@ -344,9 +348,9 @@
 	(require 'site-gentoo)
 
 to /usr/share/emacs/site-lisp/site-start.el.  Alternatively, that line
-can be added by individual users to their initialisation files, or for
-greater flexibility, users can select which of the package-specific
-initialisation files in /usr/share/emacs/site-lisp/ to load.
+can be added by individual users to their initialisation files, or,
+for greater flexibility, users can load individual package-specific
+initialisation files from /usr/share/emacs/site-lisp/.
 EOF
 		echo
 	fi



-- 
gentoo-commits@gentoo.org mailing list

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

[Ulrich Mueller (ulm)]

ulm         07/11/17 15:39:36

  Modified:             elisp-common.eclass
  Log:
  Sync eclasses from Emacs overlay (revision 734).
  
  elisp-common.eclass:
  Use square brackets for test, remove dysfunctional code in elisp-comp.
  New variable EMACSFLAGS, replaces EMACS_BATCH_CLEAN.
  Group compile functions together.

Revision  Changes    Path
1.30                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- elisp-common.eclass	14 Oct 2007 22:12:30 -0000	1.29
+++ elisp-common.eclass	17 Nov 2007 15:39:35 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.29 2007/10/14 22:12:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.30 2007/11/17 15:39:35 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
@@ -139,7 +139,7 @@
 
 EMACS=/usr/bin/emacs
 # The following works for Emacs versions 18--23, don't change it.
-EMACS_BATCH_CLEAN="${EMACS} -batch -q --no-site-file"
+EMACSFLAGS="-batch -q --no-site-file"
 
 # @FUNCTION: elisp-compile
 # @USAGE: <list of elisp files>
@@ -148,7 +148,45 @@
 
 elisp-compile() {
 	einfo "Compiling GNU Emacs Elisp files ..."
-	${EMACS_BATCH_CLEAN} -f batch-byte-compile "$@"
+	${EMACS} ${EMACSFLAGS} -f batch-byte-compile "$@"
+}
+
+# @FUNCTION: elisp-comp
+# @USAGE: <list of elisp files>
+# @DESCRIPTION:
+# Byte-compile interdependent Emacs Lisp files.
+#
+# This function byte-compiles all ".el" files which are part of its
+# arguments, using GNU Emacs, and puts the resulting ".elc" files into the
+# current directory, so disregarding the original directories used in ".el"
+# arguments.
+#
+# This function manages in such a way that all Emacs Lisp files to be
+# compiled are made visible between themselves, in the event they require or
+# load one another.
+
+elisp-comp() {
+	# Copyright 1995 Free Software Foundation, Inc.
+	# François Pinard <pinard@iro.umontreal.ca>, 1995.
+	# Originally taken from GNU autotools.
+
+	[ $# -gt 0 ] || return 1
+
+	einfo "Compiling GNU Emacs Elisp files ..."
+
+	tempdir=elc.$$
+	mkdir ${tempdir}
+	cp "$@" ${tempdir}
+	pushd ${tempdir}
+
+	echo "(add-to-list 'load-path \"../\")" > script
+	${EMACS} ${EMACSFLAGS} -l script -f batch-byte-compile *.el
+	local ret=$?
+	mv *.elc ..
+
+	popd
+	rm -fr ${tempdir}
+	return ${ret}
 }
 
 # @FUNCTION: elisp-emacs-version
@@ -158,7 +196,7 @@
 elisp-emacs-version() {
 	# The following will work for at least versions 18-23.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
-	${EMACS_BATCH_CLEAN} -l "${T}"/emacs-version.el
+	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
 }
 
 # @FUNCTION: elisp-make-autoload-file
@@ -188,7 +226,7 @@
 	;;; ${f##*/} ends here
 	EOF
 
-	${EMACS_BATCH_CLEAN} \
+	${EMACS} ${EMACSFLAGS} \
 		--eval "(setq make-backup-files nil)" \
 		--eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \
 		-f batch-update-autoloads "${@-.}"
@@ -313,46 +351,3 @@
 		echo
 	fi
 }
-
-# @FUNCTION: elisp-comp
-# @USAGE: <list of elisp files>
-# @DESCRIPTION:
-# Byte-compile interdependent Emacs Lisp files.
-#
-# This function byte-compiles all ".el" files which are part of its
-# arguments, using GNU Emacs, and puts the resulting ".elc" files into the
-# current directory, so disregarding the original directories used in ".el"
-# arguments.
-#
-# This function manages in such a way that all Emacs Lisp files to be
-# compiled are made visible between themselves, in the event they require or
-# load one another.
-
-elisp-comp() {
-	# Copyright 1995 Free Software Foundation, Inc.
-	# François Pinard <pinard@iro.umontreal.ca>, 1995.
-	# Originally taken from GNU autotools.
-
-	test $# -gt 0 || return 1
-
-	if test -z "${EMACS}" || test "${EMACS}" = "t"; then
-		# Value of "t" means we are running in a shell under Emacs.
-		# Just assume Emacs is called "emacs".
-		EMACS=/usr/bin/emacs
-	fi
-	einfo "Compiling GNU Emacs Elisp files ..."
-
-	tempdir=elc.$$
-	mkdir ${tempdir}
-	cp "$@" ${tempdir}
-	pushd ${tempdir}
-
-	echo "(add-to-list 'load-path \"../\")" > script
-	${EMACS_BATCH_CLEAN} -l script -f batch-byte-compile *.el
-	local ret=$?
-	mv *.elc ..
-
-	popd
-	rm -fr ${tempdir}
-	return ${ret}
-}



-- 
gentoo-commits@gentoo.org mailing list