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 03:41:44
Message-Id: 1380512285.100aee07667d3fa6824930bfb51740a54c0bb4d7.gienah@gentoo
1 commit: 100aee07667d3fa6824930bfb51740a54c0bb4d7
2 Author: Mark Wright <gienah <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 30 03:38:05 2013 +0000
4 Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 03:38:05 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=100aee07
7
8 workaround how upstream have not updated the ChangeLog in slime 2013-09-30
9
10 ---
11 .../files/2.0_p20130930/gentoo-changelog-date.patch | 20 ++++++++++++++++++++
12 app-emacs/slime/slime-9999.ebuild | 12 +++++++++++-
13 2 files changed, 31 insertions(+), 1 deletion(-)
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 new file mode 100644
17 index 0000000..447331f
18 --- /dev/null
19 +++ b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
20 @@ -0,0 +1,20 @@
21 +--- slime-2013-09-30-orig/slime.el 2013-02-13 18:27:14.000000000 +1100
22 ++++ slime-2013-09-30/slime.el 2013-09-30 13:32:11.690908669 +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 + (interactive "p")
27 +- (let ((changelog (expand-file-name "ChangeLog" slime-path))
28 +- (date nil))
29 +- (when (file-exists-p changelog)
30 +- (with-temp-buffer
31 +- (insert-file-contents-literally changelog nil 0 100)
32 +- (goto-char (point-min))
33 +- (setq date (symbol-name (read (current-buffer))))))
34 +- (when interactivep
35 +- (message "Slime ChangeLog dates %s." date))
36 +- date)))
37 ++ "2013-02-13"))
38 +
39 + (defvar slime-protocol-version nil)
40 + (setq slime-protocol-version
41
42 diff --git a/app-emacs/slime/slime-9999.ebuild b/app-emacs/slime/slime-9999.ebuild
43 index f2e28c6..88cb274 100644
44 --- a/app-emacs/slime/slime-9999.ebuild
45 +++ b/app-emacs/slime/slime-9999.ebuild
46 @@ -63,7 +63,13 @@ src_prepare() {
47 # SLIME uses the changelog date to make sure that the emacs side and the CL side
48 # are in sync. We hardcode it instead of letting slime determine it at runtime
49 # because ChangeLog doesn't get installed to $EMACSDIR
50 - epatch "${FILESDIR}"/2.0_p20130214/gentoo-changelog-date.patch
51 + if [[ ${PV} == *2.0_p20130214* ]]; then
52 + epatch "${FILESDIR}"/2.0_p20130214/gentoo-changelog-date.patch
53 + else
54 + # lately upstream have not updated ChangeLog, so this patch contains
55 + # an old date: 2013-02-13
56 + epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch
57 + fi
58 sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
59 || die "sed swank.lisp failed"
60 sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
61 @@ -74,7 +80,11 @@ src_prepare() {
62 }
63
64 src_compile() {
65 + elisp-compile *.el || die
66 + BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
67 + elisp-compile contrib/*.el || die
68 emake -j1 -C doc slime.info || die "Cannot build info docs"
69 +
70 if use doc; then
71 VARTEXFONTS="${T}"/fonts \
72 emake -j1 -C doc slime.pdf || die "emake doc failed"