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: app-editors/emacs-xwidget/
Date: Mon, 29 Dec 2014 12:29:43
Message-Id: 1419856448.ce7ffa160d114dcc99fc881a608917000daccae6.ulm@gentoo.org@gentoo
1 commit: ce7ffa160d114dcc99fc881a608917000daccae6
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 29 12:34:08 2014 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 29 12:34:08 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ce7ffa16
7
8 app-editors/emacs-xwidget: Set a fake version number to avoid collisions with emacs-vcs.
9
10 Package-Manager: portage-2.2.15
11
12 ---
13 app-editors/emacs-xwidget/ChangeLog | 3 +++
14 app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 4 ++--
15 2 files changed, 5 insertions(+), 2 deletions(-)
16
17 diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
18 index 28a0a5a..1cec23c 100644
19 --- a/app-editors/emacs-xwidget/ChangeLog
20 +++ b/app-editors/emacs-xwidget/ChangeLog
21 @@ -2,6 +2,9 @@
22 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
23 # $Header: $
24
25 + 29 Dec 2014; Ulrich Müller <ulm@g.o> emacs-xwidget-25.0.9999.ebuild:
26 + Set a fake version number to avoid collisions with emacs-vcs.
27 +
28 *emacs-xwidget-25.0.9999 (29 Dec 2014)
29
30 29 Dec 2014; Ulrich Müller <ulm@g.o> -emacs-xwidget-24.4.9999.ebuild,
31
32 diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
33 index 0cce171..7ae4df6 100644
34 --- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
35 +++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
36 @@ -104,8 +104,8 @@ EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
37 SITEFILE="20${PN}-${SLOT}-gentoo.el"
38
39 src_prepare() {
40 - # set a fake version number to avoid collisions between SLOTs
41 - #sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
42 + # set a fake version number to avoid collisions with emacs-vcs
43 + sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
44
45 if [[ ${PV##*.} = 9999 ]]; then
46 FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \