Fix previous commit.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 i686

4 files changed, 9 insertions, 27 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/Manifest b/app-emacs/slime/Manifest
index 7896934cf753..fb6ad154a223 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -5,19 +5,18 @@ AUX 2.0_p20061118/70slime-gentoo.el 398 RMD160 73c352f91af2477da5e962d69d822ab4e
 AUX 2.0_p20070816/70slime-gentoo.el 408 RMD160 081014e38225f55dafa39c51dc2637a197fc8755 SHA1 418a55db48cf10499aa93499e13ebeb164edf2d1 SHA256 261473d1ea0270ee4160fb8b3fb9823ef00e634efa673d0e0f205fa9a20d93a7
 AUX 2.0_p20070816/changelog-date.patch 706 RMD160 d02b29253ccfabcaef4c3d52a38bc53fb9a86472 SHA1 15f60033d1d62f1b458eedd2735baf1ae03c0547 SHA256 8c3e3abf250d9b03f1574f11716a88e3e71b367984f033cb1a624ccb7db6ded8
 AUX 2.0_p20070816/save-restriction-if-possible.patch 3037 RMD160 efd679f170def6a57726dd98a1a5bdc06177ae99 SHA1 36ed8af58a858a6f19fc92aa25058b827ab2f582 SHA256 7047c72d268127d9816e210def27324b7c80b58903f6a90d6597f408ca36d9cc
-AUX 2.0_p20070816/set-swank-wire-protocol-version.patch 445 RMD160 a5e078dcfb5433acbc4f859062af6fe423a51292 SHA1 e206a2ed89c62d53916f8e70ee14309c50449c63 SHA256 d35a47679d5e4afd8dc75df769ce9c273a721b7695b6049709e8d7befc99a72c
 AUX 2.0_p20070816/swank.asd 2313 RMD160 27ab7ebbfe3d1af58f923a0f329e7ff8526afadf SHA1 c5b4a50c2c2d175aef5ecd4c5ce8e5baab24eff9 SHA256 668cc41f4dc2c3d6a6a27294633901cdbb1e4c0459fe3b52b73ec725b8d98a4c
 AUX swank-loader.lisp 68 RMD160 28a2624c60122f50ff758923c4ca2ee666ec25ee SHA1 2f1a69b01814de704b9d041096d7c3e20d32faba SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015
 DIST slime-2.0_p20061118.tar.bz2 379335 RMD160 550687c358fa65ca27fdcdc0136b586e58186581 SHA1 cdc69b7b23317a49ee12cd23d9258074d50bb817 SHA256 2de5858fbde7a67d6557419fb3d7b17c9a1dd47a5fe5bbfdecbc1ae0c1fe7839
 DIST slime-2.0_p20070816.tar.bz2 500700 RMD160 6b6fb7c4cf0e797d901b4aa4dec45555350621df SHA1 01b4b8b937a543928838f6a19c09a20ab9be3cdb SHA256 dc393f8343b6c7e0ef32802c34e0943d45dc1b93997090d95afa1a0c0c03e977
 EBUILD slime-2.0_p20061118.ebuild 992 RMD160 93fe875be1c5d60825d56b6f5978a517c1d466f8 SHA1 bc820d191463a80018added14479830d09c762c1 SHA256 d903536a24122914bb55ec84d1cc284c7464206ea3093733e80b3e8bd609b100
-EBUILD slime-2.0_p20070816-r3.ebuild 2164 RMD160 0b9a58239bc63586a8cbb58ec33f0c284995e8bb SHA1 6d2b4be9e5b87d0acfaaec33fd569897782a8620 SHA256 3eb886d70e06f37a3c11445887a0ac238c5480dacf106e2d65aceb3def107c87
-MISC ChangeLog 13761 RMD160 f8785769001f758e1a0b4ea38a36a5fcc0c24204 SHA1 6aaa5eeb29488b6f8d31b3390481ba6465a3ec51 SHA256 9460d718d7f953471a68eef51ed98bd886018340530244b9982f73cd3e204c67
+EBUILD slime-2.0_p20070816-r3.ebuild 2065 RMD160 9e93b758e56abdbab96af8e2dda68d6ffa38b3f1 SHA1 edfc386026ae5d0173cb7cf4266fb16c144e0fcc SHA256 ff836cf954e343933a35bf3e944228bc4cdb5f3516bbaa787cae1ce35f3287a9
+MISC ChangeLog 13699 RMD160 8ab80da71439192da6e66a1229816702e5e85a57 SHA1 e7d6d7538fb648e9503e59e8cf3952cc07ba6040 SHA256 a253624b147c3bc2c30b3b0b0595e15b59cad04a3182db22851aa0a0c1b22902
 MISC metadata.xml 1267 RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 SHA1 f91c564e0b518ab158b57faf23d419c144a5898d SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkiTCT0ACgkQOeoy/oIi7uyg8ACfcYkTsMn0FTufa2UdUEDT5tnM
-Qe0AoJ9wD/546mKU1OM6P4f+Yyc9zjJG
-=wzy/
+iEYEARECAAYFAkiTH1wACgkQOeoy/oIi7uy10ACgvUAFe+M/6UzxS70bZc3xc38N
+XRQAn2pdYqS/lT8PzfxNKCQhg1xTFtFu
+=yvZc
 -----END PGP SIGNATURE-----
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"