[gentoo-commits] proj/lisp:master commit in: app-emacs/slime/, app-emacs/slime/files/2.0_p20130930/

[gentoo-commits] proj/lisp:master commit in: app-emacs/slime/, app-emacs/slime/files/2.0_p20130930/

[Mark Wright]

commit:     100aee07667d3fa6824930bfb51740a54c0bb4d7
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 03:38:05 2013 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> 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"

[gentoo-commits] proj/lisp:master commit in: app-emacs/slime/, app-emacs/slime/files/2.0_p20130930/

[Mark Wright]

commit:     8db60dccdcc4b69dbfcbfa3338d94134497c6408
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 04:50:42 2013 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> 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"