Fix previous commit.

(Portage version: 2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 i686)

3 files changed, 4 insertions, 21 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index 3159065c1062..e688a62bcc20 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-emacs/slime
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.56 2008/08/01 13:01:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.57 2008/08/01 14:35:58 ulm Exp $
 
 *slime-2.0_p20070816-r3 (01 Aug 2008)
 
@@ -9,7 +9,6 @@
   +files/2.0_p20070816/70slime-gentoo.el,
   +files/2.0_p20070816/changelog-date.patch,
   +files/2.0_p20070816/save-restriction-if-possible.patch,
-  +files/2.0_p20070816/set-swank-wire-protocol-version.patch,
   +files/2.0_p20070816/swank.asd, -files/71slime-gentoo.el,
   -files/slime-2.0_p20070816-save-restriction-if-possible.patch,
   -files/70slime-gentoo.el, -files/new-slime-ball,
diff --git a/app-emacs/slime/files/2.0_p20070816/set-swank-wire-protocol-version.patch b/app-emacs/slime/files/2.0_p20070816/set-swank-wire-protocol-version.patch
deleted file mode 100644
index dd48caeff3b4..000000000000
--- a/app-emacs/slime/files/2.0_p20070816/set-swank-wire-protocol-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur slime.old/swank.lisp slime/swank.lisp
---- slime.old/swank.lisp	2007-06-06 08:46:20.000000000 +0200
-+++ slime/swank.lisp	2007-06-28 18:06:14.000000000 +0200
-@@ -1282,7 +1282,8 @@
-          value-or-values))
-   (values))
- 
--(defvar *swank-wire-protocol-version* nil
-+(defvar *swank-wire-protocol-version*
-+  "@SWANK-WIRE-PROTOCOL-VERSION@"
-   "The version of the swank/slime communication protocol.")
- 
- (defslimefun connection-info ()
diff --git a/app-emacs/slime/slime-2.0_p20070816-r3.ebuild b/app-emacs/slime/slime-2.0_p20070816-r3.ebuild
index e65bc95c8825..9cd30c997941 100644
--- a/app-emacs/slime/slime-2.0_p20070816-r3.ebuild
+++ b/app-emacs/slime/slime-2.0_p20070816-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816-r3.ebuild,v 1.1 2008/08/01 13:01:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816-r3.ebuild,v 1.2 2008/08/01 14:35:58 ulm Exp $
 
 inherit common-lisp elisp eutils
 
@@ -18,23 +18,20 @@ DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
 CLPACKAGE=swank
-SWANK_VERSION="2007-08-16"
 SITEFILE=70${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PV}/set-swank-wire-protocol-version.patch
 	epatch "${FILESDIR}"/${PV}/changelog-date.patch
 	epatch "${FILESDIR}"/${PV}/save-restriction-if-possible.patch
 
 	# extract date of last update from ChangeLog, bug 233270
-	SLIME_CHANGELOG_DATE=$(sed -n \
-		's/^\([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\)[ \t].*/\1/;T;p;q' ChangeLog)
+	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	sed -i "s:@SWANK-WIRE-PROTOCOL-VERSION@:${SWANK_VERSION}:" swank.lisp \
+	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"