From: Ulrich Müller <ulm@gentoo.org>
Date: Tue, 20 Apr 2010 16:12:23 +0000 (+0000)
Subject: Compatibility fix for mode line format of Emacs 23, bug 311259.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0b5f92ee3ca22b5bb213a5c4bf9c1c9fc402780;p=gentoo.git

Compatibility fix for mode line format of Emacs 23, bug 311259.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/app-emacs/mmm-mode/ChangeLog b/app-emacs/mmm-mode/ChangeLog
index 3bd1c0b4a433..0777dd3529f3 100644
--- a/app-emacs/mmm-mode/ChangeLog
+++ b/app-emacs/mmm-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/mmm-mode
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mmm-mode/ChangeLog,v 1.15 2009/12/07 22:36:00 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mmm-mode/ChangeLog,v 1.16 2010/04/20 16:12:23 ulm Exp $
+
+*mmm-mode-0.4.8-r2 (20 Apr 2010)
+
+  20 Apr 2010; Ulrich Mueller <ulm@gentoo.org> +mmm-mode-0.4.8-r2.ebuild,
+  +files/mmm-mode-0.4.8-format-mode-line.patch:
+  Compatibility fix for mode line format of Emacs 23, bug 311259.
 
   07 Dec 2009; Ulrich Mueller <ulm@gentoo.org> mmm-mode-0.4.8-r1.ebuild:
   Remove redundant and misspelt configure options. Add Prefix KEYWORDS.
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index 8213d1448418..1239e8ce9fbc 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX 50mmm-mode-gentoo.el 58 RMD160 85c45b93415226b657bac8ef499ec36f756d5f07 SHA1 e2483845fec050184c7c5898b7f59c25c407b713 SHA256 2debaee15ebea94b9a79687e018c8c722c21d230a1426c6e3b486fcb3b3ed76a
+AUX mmm-mode-0.4.8-format-mode-line.patch 479 RMD160 0bc3a632c13f17fe7d48e303cbc3f27aa8ebcb8c SHA1 6cebef16c40e5b981161bbcc08712a304331e4a9 SHA256 8f10001e6363b2a1957ac570d4608b9600a4168dfc51ca2fe14b7217f0047ed4
 DIST mmm-mode-0.4.8.tar.gz 231318 RMD160 a037e0f6c9ebb60ca5bf00d6059f18d51b95e80a SHA1 ebb66debe5becb1db2452cd4555744580be24f2c SHA256 dda9b855e39c33634ff2dc521c96ab0548d9d712d064e06f3850f3b709ba0226
 EBUILD mmm-mode-0.4.8-r1.ebuild 816 RMD160 eecce3d907d76d81edcbb55817136dd3b868625d SHA1 a3b0ff5aa42c19faf640561374555f425e5fab0c SHA256 9d20762390a2fbf91d7c648408e200fb7c899c228866c32fabd3025759953193
-MISC ChangeLog 1956 RMD160 8fa4fb22f688eb8bd48f784da59bc02fbd79defa SHA1 2d8cd8d278713b2d45a9417d8c3f5909af014035 SHA256 ecad30fe4326a7bdd53e3aa452b401a69c239c275a7b71d54c36e9c1ca3da640
+EBUILD mmm-mode-0.4.8-r2.ebuild 862 RMD160 825d0ccdb0f3aaaa5c80d1d53466f4cc19a8afd1 SHA1 935a002c9ba8a5ace5a3c26005517ca494bec351 SHA256 27ef3557fede1d481472be0b07d61f82b58c4fa95fc9269236626bc08a66b7ac
+MISC ChangeLog 2179 RMD160 692e722666e776b5ace56eda08772512aab64a2f SHA1 003979d2ba7e5460fce3211494d3794e3c6c7510 SHA256 f938b24e9cb127ce5acf8e02736d2bb9d877fc58d37001850a300b8e81abf6c0
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAksdg+4ACgkQOeoy/oIi7uyYmwCgm+WFn5UcTWI3OfYCsyuNGmBb
-Nu0AnjwkZmaG1xFtwt2LljQ9BZFdxwCJ
-=XINc
+iEYEARECAAYFAkvN0ooACgkQOeoy/oIi7uyvRgCeM/MNxScOriHszWaqGpcvDFM3
+h28An1/8NTJymB1s5VUPQRGq1w9j6unv
+=TZGc
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mmm-mode/files/mmm-mode-0.4.8-format-mode-line.patch b/app-emacs/mmm-mode/files/mmm-mode-0.4.8-format-mode-line.patch
new file mode 100644
index 000000000000..b204f896f301
--- /dev/null
+++ b/app-emacs/mmm-mode/files/mmm-mode-0.4.8-format-mode-line.patch
@@ -0,0 +1,15 @@
+--- mmm-mode-0.4.8-orig/mmm-utils.el
++++ mmm-mode-0.4.8/mmm-utils.el
+@@ -78,7 +78,11 @@
+     (save-match-data
+       (dolist (pair arg-pairs)
+         (while (string-match (car pair) string)
+-          (setq string (replace-match (cdr pair) t t string))))))
++          (setq string (replace-match
++			(if (fboundp 'format-mode-line)
++			    (format-mode-line (cdr pair))
++			  (cdr pair))
++			t t string))))))
+   string)
+ 
+ (defun mmm-format-matches (string &optional on-string)
diff --git a/app-emacs/mmm-mode/mmm-mode-0.4.8-r2.ebuild b/app-emacs/mmm-mode/mmm-mode-0.4.8-r2.ebuild
new file mode 100644
index 000000000000..b08749ee7227
--- /dev/null
+++ b/app-emacs/mmm-mode/mmm-mode-0.4.8-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mmm-mode/mmm-mode-0.4.8-r2.ebuild,v 1.1 2010/04/20 16:12:23 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+ELISP_PATCHES="${P}-format-mode-line.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	econf --with-emacs
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	doinfo *.info* || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README README.Mason TODO
+}