From cc1d5c479efd0a45072b74d284c76d9710f4f2f1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Sat, 3 Dec 2011 08:54:46 +0000
Subject: [PATCH] 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.

---
 eclass/ChangeLog           |  8 +++++++-
 eclass/elisp-common.eclass |  7 +++----
 eclass/elisp.eclass        | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index fa1590abd0be..cb3f7577a8a7 100644
--- 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 b1d0a636f3cd..8b696b31f72d 100644
--- 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 0a3953664436..66c311052e61 100644
--- 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
-- 
2.26.2