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

[Ulrich Mueller (ulm)]

ulm         09/03/12 12:08:47

  Modified:             elisp.eclass elisp-common.eclass
  Log:
  Partial sync from Emacs overlay, only documentation and einfo output changes.

Revision  Changes    Path
1.38                 eclass/elisp.eclass

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

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- elisp.eclass	7 Feb 2009 11:32:45 -0000	1.37
+++ elisp.eclass	12 Mar 2009 12:08:47 -0000	1.38
@@ -1,11 +1,11 @@
-# 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.eclass,v 1.37 2009/02/07 11:32:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.38 2009/03/12 12:08:47 ulm Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.com>
-# Copyright 2007-2008 Christian Faulhammer <opfer@g.o>
-# Copyright 2007-2008 Ulrich Müller <ulm@g.o>
+# Copyright 2007-2009 Christian Faulhammer <fauli@g.o>
+# Copyright 2007-2009 Ulrich Müller <ulm@g.o>
 #
 # @ECLASS: elisp.eclass
 # @MAINTAINER:
@@ -14,7 +14,10 @@
 # @BLURB: Eclass for Emacs Lisp packages
 # @DESCRIPTION:
 #
-# This eclass sets the site-lisp directory for Emacs-related packages.
+# This eclass is designed to install elisp files of Emacs related
+# packages into the site-lisp directory. The majority of elisp packages
+# will only need to define the standard ebuild variables (like SRC_URI)
+# and optionally SITEFILE for successful installation.
 #
 # Emacs support for other than pure elisp packages is handled by
 # elisp-common.eclass where you won't have a dependency on Emacs itself.
@@ -24,26 +27,30 @@
 # file with the file name ${P}.el, then this eclass will move ${P}.el to
 # ${PN}.el in src_unpack().
 
-# @ECLASS-VARIABLE: SITEFILE
+# @ECLASS-VARIABLE: NEED_EMACS
 # @DESCRIPTION:
-# Name of package's site-init file.  The filename must match the shell
-# pattern "[1-8][0-9]*-gentoo.el"; numbers below 10 and above 89 are
-# reserved for internal use.  "50${PN}-gentoo.el" is a reasonable choice
-# in most cases.
+# If you need anything different from Emacs 21, use the NEED_EMACS
+# variable before inheriting elisp.eclass.  Set it to the major version
+# your package uses and the dependency will be adjusted.
 
 # @ECLASS-VARIABLE: DOCS
 # @DESCRIPTION:
 # DOCS="blah.txt ChangeLog" is automatically used to install the given
 # files by dodoc in src_install().
 
-# @ECLASS-VARIABLE: NEED_EMACS
+# @ECLASS-VARIABLE: SITEFILE
 # @DESCRIPTION:
-# If you need anything different from Emacs 21, use the NEED_EMACS
-# variable before inheriting elisp.eclass.  Set it to the major version
-# your package uses and the dependency will be adjusted.
+# Name of package's site-init file.  The filename must match the shell
+# pattern "[1-8][0-9]*-gentoo.el"; numbers below 10 and above 89 are
+# reserved for internal use.  "50${PN}-gentoo.el" is a reasonable choice
+# in most cases.
 
 inherit elisp-common versionator
 
+EXPORT_FUNCTIONS \
+	src_unpack src_compile src_install \
+	pkg_setup pkg_postinst pkg_postrm
+
 DEPEND=">=virtual/emacs-${NEED_EMACS:-21}"
 RDEPEND=">=virtual/emacs-${NEED_EMACS:-21}"
 IUSE=""
@@ -87,7 +94,3 @@
 elisp_pkg_postrm() {
 	elisp-site-regen
 }
-
-EXPORT_FUNCTIONS \
-	src_unpack src_compile src_install \
-	pkg_setup pkg_postinst pkg_postrm



1.56                 eclass/elisp-common.eclass

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

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- elisp-common.eclass	13 Feb 2009 17:15:58 -0000	1.55
+++ elisp-common.eclass	12 Mar 2009 12:08:47 -0000	1.56
@@ -1,11 +1,11 @@
 # 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.55 2009/02/13 17:15:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.56 2009/03/12 12:08:47 ulm Exp $
 #
 # Copyright 2002-2004 Matthew Kennedy <mkennedy@g.o>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@×××××.com>
 # Copyright 2004-2005 Mamoru Komachi <usata@g.o>
-# Copyright 2007-2008 Christian Faulhammer <opfer@g.o>
+# Copyright 2007-2008 Christian Faulhammer <fauli@g.o>
 # Copyright 2007-2009 Ulrich Müller <ulm@g.o>
 #
 # @ECLASS: elisp-common.eclass
@@ -327,7 +327,7 @@
 	[ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t
 
 	if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
-		einfo "Creating default ${SITELISP}/site-start.el ..."
+		einfo "Creating default site-start.el ..."
 		cat <<-EOF >"${T}"/site-start.el
 		;;; site-start.el
 
@@ -344,7 +344,7 @@
 		EOF
 	fi
 
-	einfon "Regenerating ${SITELISP}/site-gentoo.el ..."
+	einfon "Regenerating site-gentoo.el (${EBUILD_PHASE}) ..."
 
 	# remove any auxiliary file (from previous run)
 	rm -f "${ROOT}${SITELISP}"/00site-gentoo.el