Gentoo Archives: gentoo-commits

From: Mark Wright <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lisp:master commit in: app-emacs/slime/, app-emacs/slime/files/2.0_p20130930/
Date: Mon, 30 Sep 2013 04:54:06
Message-Id: 1380516642.8db60dccdcc4b69dbfcbfa3338d94134497c6408.gienah@gentoo
1 commit: 8db60dccdcc4b69dbfcbfa3338d94134497c6408
2 Author: Mark Wright <gienah <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 30 04:50:42 2013 +0000
4 Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 04:50:42 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=8db60dcc
7
8 lately upstream have not updated ChangeLog, so hard code it to 2013-09-30 for the live ebuild and for 2.0_p20130930
9
10 ---
11 .../slime/files/2.0_p20130930/gentoo-changelog-date.patch | 4 ++--
12 app-emacs/slime/slime-9999.ebuild | 10 ++++------
13 2 files changed, 6 insertions(+), 8 deletions(-)
14
15 diff --git a/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
16 index 447331f..6be737d 100644
17 --- a/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
18 +++ b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
19 @@ -1,5 +1,5 @@
20 --- slime-2013-09-30-orig/slime.el 2013-02-13 18:27:14.000000000 +1100
21 -+++ slime-2013-09-30/slime.el 2013-09-30 13:32:11.690908669 +1000
22 ++++ slime-2013-09-30/slime.el 2013-09-30 13:56:28.108894780 +1000
23 @@ -119,16 +119,7 @@
24 "Return the datestring of the latest entry in the ChangeLog file.
25 Return nil if the ChangeLog file cannot be found."
26 @@ -14,7 +14,7 @@
27 - (when interactivep
28 - (message "Slime ChangeLog dates %s." date))
29 - date)))
30 -+ "2013-02-13"))
31 ++ "@SLIME-CHANGELOG-DATE@"))
32
33 (defvar slime-protocol-version nil)
34 (setq slime-protocol-version
35
36 diff --git a/app-emacs/slime/slime-9999.ebuild b/app-emacs/slime/slime-9999.ebuild
37 index 88cb274..8f7180b 100644
38 --- a/app-emacs/slime/slime-9999.ebuild
39 +++ b/app-emacs/slime/slime-9999.ebuild
40 @@ -63,12 +63,10 @@ src_prepare() {
41 # SLIME uses the changelog date to make sure that the emacs side and the CL side
42 # are in sync. We hardcode it instead of letting slime determine it at runtime
43 # because ChangeLog doesn't get installed to $EMACSDIR
44 - if [[ ${PV} == *2.0_p20130214* ]]; then
45 - epatch "${FILESDIR}"/2.0_p20130214/gentoo-changelog-date.patch
46 - else
47 - # lately upstream have not updated ChangeLog, so this patch contains
48 - # an old date: 2013-02-13
49 - epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch
50 + epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch
51 + if [[ "${PV}" != "2.0_p20130214" ]]; then
52 + # lately upstream have not updated ChangeLog, so hard code it to a later date.
53 + SLIME_CHANGELOG_DATE="2013-09-30"
54 fi
55 sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
56 || die "sed swank.lisp failed"