--- cream-0.30-r3.ebuild	2004-10-02 02:13:54.000000000 +0200
+++ cream-0.31.ebuild	2004-10-13 09:25:02.044701248 +0200
@@ -1,16 +1,22 @@
 # 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-r3.ebuild,v 1.1 2004/10/02 00:13:54 ciaranm Exp $
+# $Header: $
 
 inherit vim-plugin eutils
 
 DESCRIPTION="Cream is an easy-to-use configuration of the GVim text editor"
 HOMEPAGE="http://cream.sourceforge.net"
+
+DICT_EN="eng_2.0.2"
+DICT_FR="fre_2.1"
+DICT_ES="spa_3.0"
+DICT_DE="ger_2.0.1"
+
 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 )"
+	linguas_en? ( ${HOMEPAGE}/cream-spell-dict-${DICT_EN}.zip )
+	linguas_fr? ( ${HOMEPAGE}/cream-spell-dict-${DICT_FR}.zip )
+	linguas_es? ( ${HOMEPAGE}/cream-spell-dict-${DICT_ES}.zip )
+	linguas_de? ( ${HOMEPAGE}/cream-spell-dict-${DICT_DE}.zip )"
 
 IUSE=""
 LICENSE="GPL-2"
@@ -57,15 +63,12 @@
 	cd ${S}
 	cat >cream <<EOF
 #!/bin/sh
-gvim -u NONE -U "\\\$VIM/cream/creamrc" "\$@"
+gvim --noplugin -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
-
 	# make taglist ebuild aware, bug #66052
-	epatch ${FILESDIR}/${P}-ebuilds.patch
+	epatch ${FILESDIR}/${PN}-0.30-ebuilds.patch
 }
 
 src_install() {
@@ -80,7 +83,7 @@
 	insinto /usr/share/vim/cream
 	doins *.vim creamrc
 	local dir
-	for dir in addons bitmaps spelldicts ; do
+	for dir in addons bitmaps spelldicts filetypes ; do
 		cp -R ${dir} ${D}/usr/share/vim/cream
 	done
 	dodir /usr/share/vim/vimfiles