| 1 |
ulm 11/12/03 08:54:46 |
| 2 |
|
| 3 |
Modified: elisp.eclass elisp-common.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Sync eclasses from Emacs overlay (revision 1752). |
| 6 |
elisp.eclass: Allow for user patches. New variable ELISP_REMOVE. |
| 7 |
elisp-common.eclass: Replace echo by einfo for proper logging. |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.54 eclass/elisp.eclass |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.54&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.54&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?r1=1.53&r2=1.54 |
| 15 |
|
| 16 |
Index: elisp.eclass |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v |
| 19 |
retrieving revision 1.53 |
| 20 |
retrieving revision 1.54 |
| 21 |
diff -u -r1.53 -r1.54 |
| 22 |
--- elisp.eclass 21 Oct 2011 19:16:16 -0000 1.53 |
| 23 |
+++ elisp.eclass 3 Dec 2011 08:54:46 -0000 1.54 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.53 2011/10/21 19:16:16 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.54 2011/12/03 08:54:46 ulm Exp $ |
| 29 |
# |
| 30 |
# @ECLASS: elisp.eclass |
| 31 |
# @MAINTAINER: |
| 32 |
@@ -40,6 +40,11 @@ |
| 33 |
# Patch files are searched for in the current working dir, WORKDIR, and |
| 34 |
# FILESDIR. |
| 35 |
|
| 36 |
+# @ECLASS-VARIABLE: ELISP_REMOVE |
| 37 |
+# @DEFAULT_UNSET |
| 38 |
+# @DESCRIPTION: |
| 39 |
+# Space separated list of files to remove after unpacking the sources. |
| 40 |
+ |
| 41 |
# @ECLASS-VARIABLE: SITEFILE |
| 42 |
# @DEFAULT_UNSET |
| 43 |
# @DESCRIPTION: |
| 44 |
@@ -120,6 +125,13 @@ |
| 45 |
die "Cannot find ${patch}" |
| 46 |
fi |
| 47 |
done |
| 48 |
+ |
| 49 |
+ # apply any user patches |
| 50 |
+ epatch_user |
| 51 |
+ |
| 52 |
+ if [[ -n ${ELISP_REMOVE} ]]; then |
| 53 |
+ rm ${ELISP_REMOVE} || die |
| 54 |
+ fi |
| 55 |
} |
| 56 |
|
| 57 |
# @FUNCTION: elisp_src_configure |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.77 eclass/elisp-common.eclass |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.77&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.77&content-type=text/plain |
| 65 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.76&r2=1.77 |
| 66 |
|
| 67 |
Index: elisp-common.eclass |
| 68 |
=================================================================== |
| 69 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
| 70 |
retrieving revision 1.76 |
| 71 |
retrieving revision 1.77 |
| 72 |
diff -u -r1.76 -r1.77 |
| 73 |
--- elisp-common.eclass 9 Oct 2011 09:10:41 -0000 1.76 |
| 74 |
+++ elisp-common.eclass 3 Dec 2011 08:54:46 -0000 1.77 |
| 75 |
@@ -1,6 +1,6 @@ |
| 76 |
# Copyright 1999-2011 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.76 2011/10/09 09:10:41 ulm Exp $ |
| 79 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.77 2011/12/03 08:54:46 ulm Exp $ |
| 80 |
# |
| 81 |
# @ECLASS: elisp-common.eclass |
| 82 |
# @MAINTAINER: |
| 83 |
@@ -329,7 +329,7 @@ |
| 84 |
return 1 |
| 85 |
fi |
| 86 |
|
| 87 |
- einfon "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE}) ..." |
| 88 |
+ einfo "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE}) ..." |
| 89 |
|
| 90 |
# Until January 2009, elisp-common.eclass sometimes created an |
| 91 |
# auxiliary file for backwards compatibility. Remove any such file. |
| 92 |
@@ -376,10 +376,9 @@ |
| 93 |
# was actually no change. |
| 94 |
# A case is a remerge where we have doubled output. |
| 95 |
rm -f "${T}"/site-gentoo.el |
| 96 |
- echo " no changes." |
| 97 |
+ einfo "... no changes." |
| 98 |
else |
| 99 |
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el |
| 100 |
- echo |
| 101 |
case ${#sflist[@]} in |
| 102 |
0) ewarn "... Huh? No site initialisation files found." ;; |
| 103 |
1) einfo "... ${#sflist[@]} site initialisation file included." ;; |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.32 eclass/ChangeLog |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.32&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.32&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.31&r2=1.32 |
| 112 |
|
| 113 |
Index: ChangeLog |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 116 |
retrieving revision 1.31 |
| 117 |
retrieving revision 1.32 |
| 118 |
diff -u -r1.31 -r1.32 |
| 119 |
--- ChangeLog 2 Dec 2011 10:22:41 -0000 1.31 |
| 120 |
+++ ChangeLog 3 Dec 2011 08:54:46 -0000 1.32 |
| 121 |
@@ -1,6 +1,12 @@ |
| 122 |
# ChangeLog for eclass directory |
| 123 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.31 2011/12/02 10:22:41 ferringb Exp $ |
| 125 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.32 2011/12/03 08:54:46 ulm Exp $ |
| 126 |
+ |
| 127 |
+ 03 Dec 2011; Ulrich Mueller <ulm@g.o> elisp.eclass, |
| 128 |
+ elisp-common.eclass: |
| 129 |
+ Sync eclasses from Emacs overlay (revision 1752). |
| 130 |
+ elisp.eclass: Allow for user patches. New variable ELISP_REMOVE. |
| 131 |
+ elisp-common.eclass: Replace echo by einfo for proper logging. |
| 132 |
|
| 133 |
02 Dec 2011; Brian Harring <ferringb@g.o> eutils.eclass: |
| 134 |
Fix eqawarn to match portage's return code; this fixes sporadic failures |
Archives