Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/emacs:master commit in: eclass/
Date: Thu, 31 Oct 2013 15:08:05
Message-Id: 1383232117.99251e279a016d3fd7e00e76194374d09bc48308.ulm@gentoo
1 commit: 99251e279a016d3fd7e00e76194374d09bc48308
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 31 15:08:37 2013 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 31 15:08:37 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=99251e27
7
8 Don't create site-gentoo.el in postrm phase.
9
10 ---
11 eclass/ChangeLog | 3 +++
12 eclass/elisp-common.eclass | 5 +++++
13 2 files changed, 8 insertions(+)
14
15 diff --git a/eclass/ChangeLog b/eclass/ChangeLog
16 index d443777..3bdade8 100644
17 --- a/eclass/ChangeLog
18 +++ b/eclass/ChangeLog
19 @@ -778,6 +778,9 @@
20 Copyright 2002-2012 Gentoo Foundation
21 Distributed under the terms of the GNU General Public License v2
22
23 + 31 Oct 2013; Ulrich Müller <ulm@g.o> elisp-common.eclass:
24 + Don't create site-gentoo.el in postrm phase.
25 +
26 04 Sep 2013; Ulrich Müller <ulm@g.o> elisp-common.eclass:
27 Add proper @CODE tags in comments.
28
29
30 diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
31 index 8085e56..d1e7fbb 100644
32 --- a/eclass/elisp-common.eclass
33 +++ b/eclass/elisp-common.eclass
34 @@ -362,6 +362,11 @@ elisp-site-regen() {
35 return 1
36 fi
37
38 + if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then
39 + ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase."
40 + return 0
41 + fi
42 +
43 ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})"
44
45 for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \