From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B60071381F3 for ; Mon, 30 Sep 2013 03:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1189E0D04; Mon, 30 Sep 2013 03:41:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B171E0D03 for ; Mon, 30 Sep 2013 03:41:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A08633EEBC for ; Mon, 30 Sep 2013 03:41:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D2696E5309 for ; Mon, 30 Sep 2013 03:41:21 +0000 (UTC) From: "Mark Wright" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mark Wright" Message-ID: <1380512285.100aee07667d3fa6824930bfb51740a54c0bb4d7.gienah@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: app-emacs/slime/, app-emacs/slime/files/2.0_p20130930/ X-VCS-Repository: proj/lisp X-VCS-Files: app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch app-emacs/slime/slime-9999.ebuild X-VCS-Directories: app-emacs/slime/ app-emacs/slime/files/2.0_p20130930/ X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright X-VCS-Revision: 100aee07667d3fa6824930bfb51740a54c0bb4d7 X-VCS-Branch: master Date: Mon, 30 Sep 2013 03:41:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1d50b578-f1a5-4943-b048-8ac585ae72b2 X-Archives-Hash: 89b61419a6cb7f948c273a7aa026997b commit: 100aee07667d3fa6824930bfb51740a54c0bb4d7 Author: Mark Wright gentoo org> AuthorDate: Mon Sep 30 03:38:05 2013 +0000 Commit: Mark Wright gentoo org> CommitDate: Mon Sep 30 03:38:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=100aee07 workaround how upstream have not updated the ChangeLog in slime 2013-09-30 --- .../files/2.0_p20130930/gentoo-changelog-date.patch | 20 ++++++++++++++++++++ app-emacs/slime/slime-9999.ebuild | 12 +++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) 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 new file mode 100644 index 0000000..447331f --- /dev/null +++ b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch @@ -0,0 +1,20 @@ +--- slime-2013-09-30-orig/slime.el 2013-02-13 18:27:14.000000000 +1100 ++++ slime-2013-09-30/slime.el 2013-09-30 13:32:11.690908669 +1000 +@@ -119,16 +119,7 @@ + "Return the datestring of the latest entry in the ChangeLog file. + Return nil if the ChangeLog file cannot be found." + (interactive "p") +- (let ((changelog (expand-file-name "ChangeLog" slime-path)) +- (date nil)) +- (when (file-exists-p changelog) +- (with-temp-buffer +- (insert-file-contents-literally changelog nil 0 100) +- (goto-char (point-min)) +- (setq date (symbol-name (read (current-buffer)))))) +- (when interactivep +- (message "Slime ChangeLog dates %s." date)) +- date))) ++ "2013-02-13")) + + (defvar slime-protocol-version nil) + (setq slime-protocol-version diff --git a/app-emacs/slime/slime-9999.ebuild b/app-emacs/slime/slime-9999.ebuild index f2e28c6..88cb274 100644 --- a/app-emacs/slime/slime-9999.ebuild +++ b/app-emacs/slime/slime-9999.ebuild @@ -63,7 +63,13 @@ src_prepare() { # SLIME uses the changelog date to make sure that the emacs side and the CL side # are in sync. We hardcode it instead of letting slime determine it at runtime # because ChangeLog doesn't get installed to $EMACSDIR - epatch "${FILESDIR}"/2.0_p20130214/gentoo-changelog-date.patch + if [[ ${PV} == *2.0_p20130214* ]]; then + epatch "${FILESDIR}"/2.0_p20130214/gentoo-changelog-date.patch + else + # lately upstream have not updated ChangeLog, so this patch contains + # an old date: 2013-02-13 + epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch + fi sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \ || die "sed swank.lisp failed" sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \ @@ -74,7 +80,11 @@ src_prepare() { } src_compile() { + elisp-compile *.el || die + BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \ + elisp-compile contrib/*.el || die emake -j1 -C doc slime.info || die "Cannot build info docs" + if use doc; then VARTEXFONTS="${T}"/fonts \ emake -j1 -C doc slime.pdf || die "emake doc failed"