Don't destroy all whitespace when tabifying.

(Portage version: 2.1.2.9)

4 files changed, 30 insertions, 6 deletions

diff --git a/app-emacs/ebuild-mode/ChangeLog b/app-emacs/ebuild-mode/ChangeLog
index 20dc63f8f449..523c2bc4fc2a 100644
--- a/app-emacs/ebuild-mode/ChangeLog
+++ b/app-emacs/ebuild-mode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/ebuild-mode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ebuild-mode/ChangeLog,v 1.15 2007/04/19 14:09:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ebuild-mode/ChangeLog,v 1.16 2007/06/04 22:30:13 ulm Exp $
+
+*ebuild-mode-1.5-r2 (04 Jun 2007)
+
+  04 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/ebuild-mode-1.5-fix-tabify.patch, -ebuild-mode-1.5-r1.ebuild,
+  +ebuild-mode-1.5-r2.ebuild:
+  Don't destroy all whitespace when tabifying.
 
   19 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   ebuild-mode-1.3.ebuild, ebuild-mode-1.5-r1.ebuild:
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.5-r1.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.5-r2.ebuild
index 097e129414df..0c9cd1320f5f 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.5-r1.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.5-r2.ebuild
@@ -1,15 +1,21 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ebuild-mode/ebuild-mode-1.5-r1.ebuild,v 1.2 2007/04/19 14:09:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ebuild-mode/ebuild-mode-1.5-r2.ebuild,v 1.1 2007/06/04 22:30:13 ulm Exp $
 
-inherit elisp
+inherit elisp eutils
 
-DESCRIPTION="An Emacs mode for editing Portage .ebuild, .eclass and .eselect files."
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
+DESCRIPTION="An Emacs mode for editing Portage .ebuild, .eclass and .eselect files"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-SITEFILE=50ebuild-mode-gentoo.el
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-tabify.patch"
+}
diff --git a/app-emacs/ebuild-mode/files/digest-ebuild-mode-1.5-r1 b/app-emacs/ebuild-mode/files/digest-ebuild-mode-1.5-r2
index b0854a6d53bd..b0854a6d53bd 100644
--- a/app-emacs/ebuild-mode/files/digest-ebuild-mode-1.5-r1
+++ b/app-emacs/ebuild-mode/files/digest-ebuild-mode-1.5-r2
diff --git a/app-emacs/ebuild-mode/files/ebuild-mode-1.5-fix-tabify.patch b/app-emacs/ebuild-mode/files/ebuild-mode-1.5-fix-tabify.patch
new file mode 100644
index 000000000000..44e3a079a735
--- /dev/null
+++ b/app-emacs/ebuild-mode/files/ebuild-mode-1.5-fix-tabify.patch
@@ -0,0 +1,11 @@
+--- ebuild-mode.el~	2007-03-22 16:02:50.000000000 +0100
++++ ebuild-mode.el	2007-06-05 00:21:29.000000000 +0200
+@@ -72,7 +72,7 @@
+ 	face))
+ 
+ (defun ebuild-mode-tabify ()
+-  (save-excursion
++  (let ((tabify-regexp "^\t* [ \t]+"))
+     (tabify (point-min) (point-max))))
+ 
+ (define-derived-mode ebuild-mode shell-script-mode "Ebuild"