[gentoo-commits] repo/gentoo:master commit in: app-emacs/slime/files/2.15/, app-emacs/slime/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/slime/files/2.15/, app-emacs/slime/

[Mark Wright]

commit:     a7f26198fbd44390a5b72d82cca6c76226465aad
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 09:24:16 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 09:24:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f26198

app-emacs/slime: Bump to 2.15

Package-Manager: portage-2.2.20.1

 app-emacs/slime/Manifest                             |  1 +
 .../slime/files/2.15/gentoo-changelog-date.patch     | 20 ++++++++++++++++++++
 app-emacs/slime/slime-2.11.ebuild                    | 14 +++++++++-----
 app-emacs/slime/slime-2.12.ebuild                    | 12 ++++++++----
 .../slime/{slime-2.12.ebuild => slime-2.15.ebuild}   | 12 ++++++++----
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index ee07c1c..c129c47 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -4,3 +4,4 @@ DIST slime-2.0_p20101103-patches.tar.bz2 4730 SHA256 9cab942f4ea64ec2f0e127db3b5
 DIST slime-2.0_p20101103.tar.bz2 725888 SHA256 0596532fa8cb78e59f685557474bd0ac5d00a79ac84c361ab93f079797a4041f SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d WHIRLPOOL 3421ea5aa5ed96a3d7b552fe74804bc3e7e822dd21623c0b36f7f84d7ad726fa57d0eb496e15d4ef9ea5027f0c247a3ba8ae7ae46118851c3f0ed13ec1cf482f
 DIST slime-2.11.tar.gz 1054516 SHA256 d63962c22f983a52519fb51b5ca28183aeb23ff6892804d02311e54d73ec8b2a SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850 WHIRLPOOL 530c5b341f2ca4a95c954cea848c67cfd027345691feb9c246eb56ecaf6c420b642ed1991f1d615dabc0ca1f54bc6b28482e57c800498cf25a17ce39a7dc0ba3
 DIST slime-2.12.tar.gz 1057243 SHA256 29d57d1036abe69cb62809b5bb31d08c76c3e0e559b7e601b9d76fb7a554d53b SHA512 f18c79cba3eb75761982f2d1f163aab8213b77fa72a689d110fe91b1aa40953516566adc5f771638eee95d33ba8b4c8842ddf99738804483ccfb76a00290b2a1 WHIRLPOOL b0b78101f114514c16cba823dee02aac8a1fee74d23d5623838c2fdedaaa4fda953e6ee9bfcfcd6cf5a174d245f4ba801596c16e0bb67c1729d73a69d0ebc0b1
+DIST slime-2.15.tar.gz 1072190 SHA256 bad1851ce99b7f40b0593dc91842b261b526e0af797e660184159dda05355f50 SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611 WHIRLPOOL ff2d8f76314c111782f7c96c6e509197b0620149e683ebbc91714d77d6a0d4b52ba10dad5d8590b321de3867188997876b13fff533ca49361161b8fcff9a48d2

diff --git a/app-emacs/slime/files/2.15/gentoo-changelog-date.patch b/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
new file mode 100644
index 0000000..c7e815f
--- /dev/null
+++ b/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
@@ -0,0 +1,20 @@
+--- slime-2.15-orig/slime.el	2015-08-31 07:46:47.000000000 +1000
++++ slime-2.15/slime.el	2015-09-17 17:05:53.616659817 +1000
+@@ -138,16 +138,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 (slime--changelog-file-name))
+-          (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)))
++    "@SLIME-CHANGELOG-DATE@"))
+ 
+ (defvar slime-protocol-version nil)
+ (setq slime-protocol-version

diff --git a/app-emacs/slime/slime-2.11.ebuild b/app-emacs/slime/slime-2.11.ebuild
index effd244..72f8d25 100644
--- a/app-emacs/slime/slime-2.11.ebuild
+++ b/app-emacs/slime/slime-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -54,10 +54,14 @@ src_prepare() {
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	# 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.11/gentoo-changelog-date.patch
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# 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.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
 
 	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
 	# /usr/share/common-lisp/source/swank/swank-backend.lisp

diff --git a/app-emacs/slime/slime-2.12.ebuild b/app-emacs/slime/slime-2.12.ebuild
index c0a8ff2..72f8d25 100644
--- a/app-emacs/slime/slime-2.12.ebuild
+++ b/app-emacs/slime/slime-2.12.ebuild
@@ -54,10 +54,14 @@ src_prepare() {
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	# 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.11/gentoo-changelog-date.patch
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# 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.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
 
 	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
 	# /usr/share/common-lisp/source/swank/swank-backend.lisp

diff --git a/app-emacs/slime/slime-2.12.ebuild b/app-emacs/slime/slime-2.15.ebuild
similarity index 89%
copy from app-emacs/slime/slime-2.12.ebuild
copy to app-emacs/slime/slime-2.15.ebuild
index c0a8ff2..72f8d25 100644
--- a/app-emacs/slime/slime-2.12.ebuild
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -54,10 +54,14 @@ src_prepare() {
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	# 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.11/gentoo-changelog-date.patch
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# 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.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
 
 	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
 	# /usr/share/common-lisp/source/swank/swank-backend.lisp