Fix screwy recursive autocmd badness, bug #61158. Thanks to TGL <degrenier@easyconnect.fr> for the patch.

5 files changed, 148 insertions, 11 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 49ff71fe3636..e64c37b1100d 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-vim/cream
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.14 2004/08/20 16:36:04 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.15 2004/08/26 19:07:39 ciaranm Exp $
+
+*cream-0.30-r2 (26 Aug 2004)
+
+  26 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/cream-0.30-autocmd.patch, +cream-0.30-r2.ebuild:
+  Fix screwy recursive autocmd badness, bug #61158. Thanks to TGL
+  <degrenier@easyconnect.fr> for the patch.
 
   20 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> cream-0.30-r1.ebuild,
   -cream-0.30.ebuild:
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 994383fafdfb..0ab43c0b8f41 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5bc4b841f09feb3e97091cb1767a36b2 cream-0.30-r1.ebuild 2120
 MD5 b5480467d60a7baef45eaf6e1e89f6e2 cream-0.29-r1.ebuild 2048
 MD5 6966a8c0caae48d13b7c0b046aeb7fca ChangeLog 2364
 MD5 0f44d41b4361ca8e1412c3d395cc3923 metadata.xml 434
 MD5 ed33e142107e0ad62a7ee9dbb65faf99 cream-0.28.ebuild 838
+MD5 7c291c0af49753726d7ab759db72f699 cream-0.30-r2.ebuild 2214
 MD5 72e0247891a704fa4cbe72a221b62a56 files/cream-0.29-ctags.patch 825
+MD5 305830ed8a287efa536fb2a951a75c7f files/digest-cream-0.30-r2 347
 MD5 305830ed8a287efa536fb2a951a75c7f files/digest-cream-0.30-r1 347
+MD5 dec23f9499a37ffb1aa3f2204db69611 files/cream-0.30-autocmd.patch 1489
 MD5 94138ab0e32dfd93c1412066535c1edf files/digest-cream-0.29-r1 347
 MD5 11a37b610fef3f6de7fca7058b1432e2 files/cream-0.29-paths.patch 1801
 MD5 a4b3168e3d6553e216fece5e86da946d files/cream.sh 128
 MD5 b805bdc2fd56028f6182d4fe44cfb033 files/digest-cream-0.28 62
 MD5 130945b9ad1e1413be8ede26054e2a91 files/cream-0.29-desktop.patch 313
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBJifOLLFUmVNQ7rkRAn7sAJ9+SCumpJdT4YE84Ut8asb8s2ywjwCgug6u
-xX5toasl/RSy3dBr3lNIYL0=
-=WTI+
------END PGP SIGNATURE-----
diff --git a/app-vim/cream/cream-0.30-r2.ebuild b/app-vim/cream/cream-0.30-r2.ebuild
new file mode 100644
index 000000000000..0e471b6c17b7
--- /dev/null
+++ b/app-vim/cream/cream-0.30-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.30-r2.ebuild,v 1.1 2004/08/26 19:07:39 ciaranm Exp $
+
+inherit vim-plugin eutils
+
+DESCRIPTION="Cream is an easy-to-use configuration of the GVim text editor"
+HOMEPAGE="http://cream.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	linguas_en? ( ${HOMEPAGE}/cream-spell-dict-eng-l.zip )
+	linguas_fr? ( ${HOMEPAGE}/cream-spell-dict-fre-l.zip )
+	linguas_es? ( ${HOMEPAGE}/cream-spell-dict-spa-l.zip )
+	linguas_de? ( ${HOMEPAGE}/cream-spell-dict-ger-l.zip )"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64"
+
+DEPEND=""
+RDEPEND=">=app-editors/gvim-6.2
+	dev-util/ctags"
+
+src_unpack() {
+	mkdir -p ${S}/spelldicts
+
+	# install spell dictionaries into ${S}/spelldicts
+	local my_a
+	for my_a in ${A} ; do
+		if [ -z ${my_a/*spell-dict*/} ] ; then
+			cd ${S}/spelldicts
+			unpack ${my_a}
+		else
+			cd ${WORKDIR}
+			unpack ${my_a}
+		fi
+	done
+
+	# change installation path + fix the wrapper command (disable plugins)
+	cd ${S}
+	cat >cream <<EOF
+#!/bin/sh
+gvim -u NONE -U "\\\$VIM/cream/creamrc" "\$@"
+EOF
+	sed -i "/let \$CREAM/s:VIMRUNTIME:VIM:" creamrc || die "sed #1 broke"
+
+	# fix up evil autocmd behaviour, bug #61158
+	epatch ${FILESDIR}/${P}-autocmd.patch
+}
+
+src_install() {
+	# install launcher and menu entry
+	dobin cream
+	insinto /usr/share/applications
+	doins cream.desktop
+	insinto /usr/share/icons
+	doins cream.svg cream.png
+
+	# install shared vim files
+	insinto /usr/share/vim/cream
+	doins *.vim creamrc
+	local dir
+	for dir in addons bitmaps spelldicts ; do
+		cp -R ${dir} ${D}/usr/share/vim/cream
+	done
+	dodir /usr/share/vim/vimfiles
+	cp -R help ${D}/usr/share/vim/vimfiles/doc
+
+	# install docs
+	dodoc docs/*
+	dohtml docs-html/*
+}
+
+pkg_postinst() {
+	einfo " "
+	einfo "To specify which dictionaries are installed with this ebuild,"
+	einfo "set the LINGUAS variable in /etc/make.conf. For example, to"
+	einfo "install full English and French dictionaries, use:"
+	einfo "    LINGUAS=\"en fr\""
+	einfo " "
+	if [ -z "${LINGUAS}" ] ; then
+		einfo "By default, a small English dictionary was installed."
+		einfo " "
+	fi
+}
diff --git a/app-vim/cream/files/cream-0.30-autocmd.patch b/app-vim/cream/files/cream-0.30-autocmd.patch
new file mode 100644
index 000000000000..9cb731668bdb
--- /dev/null
+++ b/app-vim/cream/files/cream-0.30-autocmd.patch
@@ -0,0 +1,47 @@
+diff -uNr cream.orig/cream-autocmd.vim cream/cream-autocmd.vim
+--- cream.orig/cream-autocmd.vim	2004-08-21 16:22:19.000000000 +0200
++++ cream/cream-autocmd.vim	2004-08-21 16:24:35.045714424 +0200
+@@ -158,7 +158,10 @@
+ " filetype and syntax highlighting
+ 
+ " detect on VimEnter so dependencies can know filetype
+-autocmd VimEnter,BufEnter,FileType * call Cream_filetype()
++autocmd VimEnter,BufEnter * call Cream_filetype()
++
++" add cream-specific improvements for some filetypes
++autocmd FileType * call Cream_filetype_setup()
+ 
+ " syntax highlighting (must follow filetype detection)
+ autocmd VimEnter * call Cream_syntax_init()
+diff -uNr cream.orig/cream-filetype.vim cream/cream-filetype.vim
+--- cream.orig/cream-filetype.vim	2004-08-21 16:22:19.000000000 +0200
++++ cream/cream-filetype.vim	2004-08-21 16:27:55.590424568 +0200
+@@ -32,7 +32,6 @@
+ " detect and set conditions based on filetype
+ " o {argument} (optional) is filetype to set, otherwise detected
+ 
+-	" set or detect
+ 	if a:0 > 0
+ 		execute "set filetype=" . a:1
+ 	else
+@@ -43,13 +42,18 @@
+ 		set filetype=txt
+ 	endif
+ 
+-	" setup
++endfunction
++
++function! Cream_filetype_setup()
++" add cream-specific improvements to some filetypes
++" this functions is called as an autocmd on the FileType event
++
+ 	if &filetype == "c"
+ 		call Cream_source($CREAM . "cream-filetype-c.vim")
+ 	endif
+ 
+ 	if &filetype == "html"
+-	\&& &filetype == "php"
++	\|| &filetype == "php"
+ 		call Cream_source($CREAM . "cream-filetype-html.vim")
+ 	endif
+ 
diff --git a/app-vim/cream/files/digest-cream-0.30-r2 b/app-vim/cream/files/digest-cream-0.30-r2
new file mode 100644
index 000000000000..3c95c534df46
--- /dev/null
+++ b/app-vim/cream/files/digest-cream-0.30-r2
@@ -0,0 +1,5 @@
+MD5 3da73a680131457aa91d69937bbc8834 cream-0.30.tar.gz 851705
+MD5 0feced056ac9b8da47a9b6f5dcbcbe79 cream-spell-dict-eng-l.zip 993303
+MD5 605681995cb3efc34b6bbe9a14ed5697 cream-spell-dict-fre-l.zip 814327
+MD5 d8ee68a5976d7aa3ac8f958a10d716d7 cream-spell-dict-spa-l.zip 1027692
+MD5 e3b5c16aeac644800be7e36fc13c03bf cream-spell-dict-ger-l.zip 836992