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 1393D1381F3 for ; Mon, 30 Sep 2013 04:54:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 650D9E0B06; Mon, 30 Sep 2013 04:54:02 +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 DBC31E0B06 for ; Mon, 30 Sep 2013 04:54:01 +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 ED1E833EED3 for ; Mon, 30 Sep 2013 04:54:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8EFAEE5309 for ; Mon, 30 Sep 2013 04:53:59 +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: <1380516642.8db60dccdcc4b69dbfcbfa3338d94134497c6408.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: 8db60dccdcc4b69dbfcbfa3338d94134497c6408 X-VCS-Branch: master Date: Mon, 30 Sep 2013 04:53:59 +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: aff94bc2-8bfa-452e-8a59-baedb751ae39 X-Archives-Hash: 4b2869d4c585c97a63306bf9c2c67c85 commit: 8db60dccdcc4b69dbfcbfa3338d94134497c6408 Author: Mark Wright gentoo org> AuthorDate: Mon Sep 30 04:50:42 2013 +0000 Commit: Mark Wright gentoo org> CommitDate: Mon Sep 30 04:50:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=8db60dcc lately upstream have not updated ChangeLog, so hard code it to 2013-09-30 for the live ebuild and for 2.0_p20130930 --- .../slime/files/2.0_p20130930/gentoo-changelog-date.patch | 4 ++-- app-emacs/slime/slime-9999.ebuild | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) 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 index 447331f..6be737d 100644 --- a/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch +++ b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch @@ -1,5 +1,5 @@ --- 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 ++++ slime-2013-09-30/slime.el 2013-09-30 13:56:28.108894780 +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." @@ -14,7 +14,7 @@ - (when interactivep - (message "Slime ChangeLog dates %s." date)) - date))) -+ "2013-02-13")) ++ "@SLIME-CHANGELOG-DATE@")) (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 88cb274..8f7180b 100644 --- a/app-emacs/slime/slime-9999.ebuild +++ b/app-emacs/slime/slime-9999.ebuild @@ -63,12 +63,10 @@ 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 - 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 + epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch + if [[ "${PV}" != "2.0_p20130214" ]]; then + # lately upstream have not updated ChangeLog, so hard code it to a later date. + SLIME_CHANGELOG_DATE="2013-09-30" fi sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \ || die "sed swank.lisp failed"