Add syntax highlighting fix (bug #52363)

5 files changed, 88 insertions, 2 deletions

diff --git a/app-vim/vimspell/ChangeLog b/app-vim/vimspell/ChangeLog
index 8b5a7a41095d..0bd4fff5143b 100644
--- a/app-vim/vimspell/ChangeLog
+++ b/app-vim/vimspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-vim/vimspell
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/ChangeLog,v 1.8 2004/05/12 15:59:17 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/ChangeLog,v 1.9 2004/05/31 17:18:13 ciaranm Exp $
+
+*vimspell-1.84-r1 (31 May 2004)
+
+  31 May 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/vimspell-1.84-explorersyntax.patch, +vimspell-1.84-r1.ebuild:
+  Add syntax highlighting fix (bug #52363)
 
   12 May 2004; Ciaran McCreesh <ciaranm@gentoo.org> -vimspell-1.68.ebuild,
   -vimspell-1.83.ebuild, vimspell-1.84.ebuild:
diff --git a/app-vim/vimspell/Manifest b/app-vim/vimspell/Manifest
index eaff28f67794..818759179289 100644
--- a/app-vim/vimspell/Manifest
+++ b/app-vim/vimspell/Manifest
@@ -1,6 +1,9 @@
-MD5 f6ea02ec2d9f75b1bd714b3ba3ebf2b8 ChangeLog 1204
+MD5 39e8f5fc350d6623d2c30574afd9afc9 ChangeLog 1404
 MD5 df1a9c1462d41c99842ea632772aee75 vimspell-1.84.ebuild 2313
 MD5 5603cc99f3e3662f1c0fc36cab5e5ee6 vimspell-1.70.ebuild 2299
 MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
+MD5 e1c6db0878219807f96e7bfe068dcc17 vimspell-1.84-r1.ebuild 2436
 MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84 65
 MD5 6a4ee637c8498ba26e82c61844aa5e55 files/digest-vimspell-1.70 65
+MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84-r1 65
+MD5 520de6488ff85f36d4f694cff73dd30b files/vimspell-1.84-explorersyntax.patch 509
diff --git a/app-vim/vimspell/files/digest-vimspell-1.84-r1 b/app-vim/vimspell/files/digest-vimspell-1.84-r1
new file mode 100644
index 000000000000..bd1cfe60788b
--- /dev/null
+++ b/app-vim/vimspell/files/digest-vimspell-1.84-r1
@@ -0,0 +1 @@
+MD5 7f3a6de67f1e09f5a77743015bc8e83e vimspell-1.84.tar.bz2 17841
diff --git a/app-vim/vimspell/files/vimspell-1.84-explorersyntax.patch b/app-vim/vimspell/files/vimspell-1.84-explorersyntax.patch
new file mode 100644
index 000000000000..7333055a8bda
--- /dev/null
+++ b/app-vim/vimspell/files/vimspell-1.84-explorersyntax.patch
@@ -0,0 +1,16 @@
+--- plugin/vimspell.vim	2004-05-29 16:14:52.000000000 +0100
++++ plugin/vimspell.vim	2004-05-29 16:27:13.433130488 +0100
+@@ -713,7 +713,12 @@
+ 
+   call s:SpellCheckLanguage()
+ 
+-  call s:SpellTuneCommentSyntax(&l:ft)
++  " We don't want to make any changes to syntax highlighting if we're editing
++  " a directory rather than a file, because this upsets the builtin
++  " explorer.vim plugin.
++  if ! isdirectory(expand("%"))
++    call s:SpellTuneCommentSyntax(&l:ft)
++  endif
+ 
+   call s:SpellSaveIskeyword()
+ 
diff --git a/app-vim/vimspell/vimspell-1.84-r1.ebuild b/app-vim/vimspell/vimspell-1.84-r1.ebuild
new file mode 100644
index 000000000000..88198804e0ff
--- /dev/null
+++ b/app-vim/vimspell/vimspell-1.84-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.84-r1.ebuild,v 1.1 2004/05/31 17:18:13 ciaranm Exp $
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: on-the-fly spell checking with aspell"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=465"
+LICENSE="GPL-1 | GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~ppc ~amd64 ~mips"
+
+# In theory, this plugin supports either aspell or ispell. However,
+# virtual/spell has been removed by seemant in favour of just using
+# app-text/aspell:
+# 20:06 <@seemant> ciaranm: I think I might have removed it, come to
+#   think of it, because I was on a kick to get everything converted
+#   to aspell instead of ispell
+# 20:06 <@seemant> for the simple reason that ispell blows dogs
+# So we'll just force people to use aspell...
+RDEPEND="$RDEPEND app-text/aspell"
+
+function src_unpack() {
+	unpack ${A}
+	cd ${S}/plugin
+
+	# Apply patch to fix directory syntax highlighting (bug #52363)
+	epatch ${FILESDIR}/${PN}-${PV}-explorersyntax.patch
+
+	# This plugin needs to be told which spell program to use. The default
+	# is hard-coded as 'ispell' in the plugin file. We can fix that with a
+	# bit of sed magic. 
+	OLD_DEFAULT='s:SpellGetOption("spell_executable","ispell")'
+	NEW_DEFAULT='s:SpellGetOption("spell_executable","aspell")'
+	sed -e "s/$OLD_DEFAULT/$NEW_DEFAULT/g" \
+		-i vimspell.vim || die "default setting fix failed"
+
+	# This plugin also tries to install its own documentation automatically
+	# upon load. This breaks emerge unmerge, so we'll install the docs
+	# manually.
+	mkdir ${S}/doc || die
+	cd ${S}/doc
+	cp ${S}/plugin/vimspell.vim vimspell.txt
+
+	sed -e "1,/^=== \+START_DOC/d" \
+		-e "/^=== \+END_DOC/,\$d"  \
+		-e "s/{{{[1-9]/    /g"     \
+		-e "s/#version#/v${PV}/g"  \
+		-i vimspell.txt || die "docs failed"
+	echo -ne "\n vim:tw=78:ts=8:ft=help:norl:\n" >> vimspell.txt
+
+	# Unfortunately, there's a rather large logic error in the documentation
+	# installation code. If vim can't write to /usr/share/vim/vimfiles/doc/
+	# then the plugin will try to install a copy of the docs locally, even if
+	# the global directory has an up-to-date copy. To get around this we'll
+	# make the SpellInstallDocumentation function do nothing.
+	cd ${S}/plugin
+	sed -e "/^function! s:SpellInstallDocumentation/a\    return 0" \
+		-i vimspell.vim || die "install fix failed"
+}
+