app-emacs/slime: Bump to 2.15

Package-Manager: portage-2.2.20.1

5 files changed, 164 insertions, 9 deletions

diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index ee07c1c27c70..c129c4720702 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 000000000000..c7e815f00fe6
--- /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 effd2445cafc..72f8d257fab8 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 c0a8ff269529..72f8d257fab8 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.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
new file mode 100644
index 000000000000..72f8d257fab8
--- /dev/null
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""
+
+inherit common-lisp-3 ${GIT_ECLASS} elisp eutils
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+if [[ ${PV} == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+		dev-lisp/asdf"
+DEPEND="${RDEPEND}
+		>=sys-apps/texinfo-5.1
+		doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		EGIT_REPO_URI="https://github.com/slime/slime.git"
+		${GIT_ECLASS}_src_unpack
+	fi
+	elisp_src_unpack
+}
+
+src_prepare() {
+	if [[ "${PV}" == "2.11" ]]; then
+		epatch "${FILESDIR}"/2.11/dont-load-sbcl-pprint.patch
+	fi
+	epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
+	epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
+	has_version ">=app-editors/emacs-24" && rm -f lib/cl-lib.el
+
+	# extract date of last update from ChangeLog, bug 233270
+	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
+	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
+
+	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
+	pushd swank || die
+	for i in *.lisp
+	do
+		mv ${i} ../swank-${i}
+	done
+	popd
+
+	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 \
+		|| die "sed slime.el failed"
+	sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
+		|| die "sed doc/slime.texi failed"
+
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm -f xref.lisp
+}
+
+src_compile() {
+	elisp-compile *.el || die
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el lib/*.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"
+	fi
+}
+
+src_install() {
+	## install core
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
+		|| die "Cannot install SLIME core"
+	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
+		>"${T}"/${SITEFILE} || die "sed failed"
+	elisp-site-file-install "${T}"/${SITEFILE} || die
+	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
+	# remove upstream swank-loader, since it won't be used
+	rm "${S}"/swank-loader.lisp
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf swank.asd
+
+	## install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
+		|| die "Cannot install contribs"
+	common-lisp-install-sources contrib/*.lisp
+
+	## install lib
+	elisp-install ${PN}/lib/ lib/*.{el,elc} \
+		|| die "Cannot install libs"
+
+	## install docs
+	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
+	newdoc contrib/README.md README-contrib.md
+	newdoc contrib/ChangeLog ChangeLog.contrib
+	doinfo doc/slime.info
+	use doc && dodoc doc/*.pdf
+}