Sync eclasses from Emacs overlay (revision 1752).

elisp.eclass: Allow for user patches. New variable ELISP_REMOVE.
elisp-common.eclass: Replace echo by einfo for proper logging.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index fa1590abd0be85e0789314a1e2c1c40173651edc..cb3f7577a8a793663acea5672429b0848ab39253 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.31 2011/12/02 10:22:41 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.32 2011/12/03 08:54:46 ulm Exp $
+
+  03 Dec 2011; Ulrich Mueller <ulm@gentoo.org> elisp.eclass,
+  elisp-common.eclass:
+  Sync eclasses from Emacs overlay (revision 1752).
+  elisp.eclass: Allow for user patches. New variable ELISP_REMOVE.
+  elisp-common.eclass: Replace echo by einfo for proper logging.
 
   02 Dec 2011; Brian Harring <ferringb@gentoo.org> eutils.eclass:
   Fix eqawarn to match portage's return code; this fixes sporadic failures

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index b1d0a636f3cdfdc74b3651d22d02ff343a27dc8b..8b696b31f72d17f0f24fb5d39747f3f3f55728bd 100644 (file)
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -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.76 2011/10/09 09:10:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.77 2011/12/03 08:54:46 ulm Exp $
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
@@ -329,7 +329,7 @@ elisp-site-regen() {
                return 1
        fi
 
-       einfon "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE}) ..."
+       einfo "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.
@@ -376,10 +376,9 @@ elisp-site-regen() {
                # was actually no change.
                # A case is a remerge where we have doubled output.
                rm -f "${T}"/site-gentoo.el
-               echo " no changes."
+               einfo "... no changes."
        else
                mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
-               echo
                case ${#sflist[@]} in
                        0) ewarn "... Huh? No site initialisation files found." ;;
                        1) einfo "... ${#sflist[@]} site initialisation file included." ;;

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 0a3953664436ec7b714fa8725db9580de298dd78..66c311052e612be991dfba572faaec56ad5f50f9 100644 (file)
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -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.eclass,v 1.53 2011/10/21 19:16:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.54 2011/12/03 08:54:46 ulm Exp $
 #
 # @ECLASS: elisp.eclass
 # @MAINTAINER:
@@ -40,6 +40,11 @@
 # Patch files are searched for in the current working dir, WORKDIR, and
 # FILESDIR.
 
+# @ECLASS-VARIABLE: ELISP_REMOVE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Space separated list of files to remove after unpacking the sources.
+
 # @ECLASS-VARIABLE: SITEFILE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -120,6 +125,13 @@ elisp_src_prepare() {
                        die "Cannot find ${patch}"
                fi
        done
+
+       # apply any user patches
+       epatch_user
+
+       if [[ -n ${ELISP_REMOVE} ]]; then
+               rm ${ELISP_REMOVE} || die
+       fi
 }
 
 # @FUNCTION: elisp_src_configure