Tidy up old versions

15 files changed, 8 insertions, 585 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 3a69bfbd925a..eaae2e7aae50 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.20 2004/10/31 15:12:17 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.21 2004/10/31 15:16:02 ciaranm Exp $
+
+  31 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  -files/cream-0.29-ctags.patch, -files/cream-0.29-desktop.patch,
+  -files/cream-0.29-paths.patch, -files/cream-0.30-autocmd.patch,
+  -cream-0.28.ebuild, -cream-0.29-r1.ebuild, -cream-0.30-r1.ebuild,
+  -cream-0.30-r2.ebuild, -cream-0.30-r3.ebuild:
+  Tidy up old versions
 
   31 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org> cream-0.31.ebuild:
   Stable on sparc, mips, x86
diff --git a/app-vim/cream/cream-0.28.ebuild b/app-vim/cream/cream-0.28.ebuild
deleted file mode 100644
index 09757c46fb40..000000000000
--- a/app-vim/cream/cream-0.28.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.28.ebuild,v 1.5 2004/07/14 13:18:33 agriffis Exp $
-
-inherit vim-plugin
-
-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"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 sparc ~mips ~ppc"
-IUSE=""
-DEPEND=""
-RDEPEND=">=app-editors/gvim-6.2"
-
-src_install() {
-	newbin ${FILESDIR}/cream.sh cream
-	insinto /usr/share/vim/cream
-	doins *.vim .vimrc .gvimrc
-	local dir
-	for dir in addons bitmaps spelldicts views ; do
-		cp -R ${dir} ${D}/usr/share/vim/cream
-	done
-	dodir /usr/share/vim/vimfiles
-	cp -R help ${D}/usr/share/vim/vimfiles/doc
-	dodoc docs/*
-	dohtml docs-html/*
-}
diff --git a/app-vim/cream/cream-0.29-r1.ebuild b/app-vim/cream/cream-0.29-r1.ebuild
deleted file mode 100644
index f77a6cf61760..000000000000
--- a/app-vim/cream/cream-0.29-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.29-r1.ebuild,v 1.4 2004/06/24 23:00:58 agriffis 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"
-
-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
-
-	# apply patches
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.29-paths.patch
-	epatch ${FILESDIR}/${PN}-0.29-desktop.patch
-	epatch ${FILESDIR}/${PN}-0.29-ctags.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/cream-0.30-r1.ebuild b/app-vim/cream/cream-0.30-r1.ebuild
deleted file mode 100644
index 16e13caaf711..000000000000
--- a/app-vim/cream/cream-0.30-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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-r1.ebuild,v 1.2 2004/08/20 16:36:04 ciaranm Exp $
-
-inherit vim-plugin
-
-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"
-}
-
-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/cream-0.30-r2.ebuild b/app-vim/cream/cream-0.30-r2.ebuild
deleted file mode 100644
index 8ccd7474ec6a..000000000000
--- a/app-vim/cream/cream-0.30-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.3 2004/09/11 00:20:16 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"
-
-VIM_PLUGIN_HELPTEXT=\
-"Cream is completly independent from the rest of your Vim/GVim setup.
-To launch GVim in Cream mode, use this wrapper script:
-\    % cream [filename...]
-
-Cream's documentation has been installed in ${ROOT}usr/share/doc/${PF}
-In particular, you may want to read:
-
-\ - the Cream features list:
-file://${ROOT}usr/share/doc/${PF}/html/features.html
-
-\ - the Cream shortcuts list:
-file://${ROOT}usr/share/doc/${PF}/html/keyboardshortcuts.html
-
-\ - the Cream FAQ:
-file://${ROOT}usr/share/doc/${PF}/html/faq.html"
-
-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_setup() {
-	einfo "Cream comes with several dictionaries for spell checking. In"
-	einfo "all cases, at least a small English dictionary will be installed."
-	einfo " "
-	einfo "To specify which optional dictionaries are installed, set the"
-	einfo "LINGUAS variable in /etc/make.conf. For example, to install full"
-	einfo "English and French dictionaries, use:"
-	einfo "    LINGUAS=\"en fr\""
-	einfo " "
-	einfo "Available dictionaries are:"
-	for dict in "English en" "French fr" "German de" "Spanish es" ; do
-		# portage bug: shouldn't get a QA notice for linguas stuff...
-		einfo "    ${dict% *} \t(${dict#* }) $( ( \
-			use linguas_${dict#* } &>/dev/null && \
-			echo '(Will be installed)' ) || echo '(Will not be installed)' )"
-	done
-	einfo " "
-	# give the user time to cancel if necessary
-	epause
-}
-
diff --git a/app-vim/cream/cream-0.30-r3.ebuild b/app-vim/cream/cream-0.30-r3.ebuild
deleted file mode 100644
index 63a40fcfe15f..000000000000
--- a/app-vim/cream/cream-0.30-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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 $
-
-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"
-
-VIM_PLUGIN_HELPTEXT=\
-"Cream is completly independent from the rest of your Vim/GVim setup.
-To launch GVim in Cream mode, use this wrapper script:
-\    % cream [filename...]
-
-Cream's documentation has been installed in ${ROOT}usr/share/doc/${PF}
-In particular, you may want to read:
-
-\ - the Cream features list:
-file://${ROOT}usr/share/doc/${PF}/html/features.html
-
-\ - the Cream shortcuts list:
-file://${ROOT}usr/share/doc/${PF}/html/keyboardshortcuts.html
-
-\ - the Cream FAQ:
-file://${ROOT}usr/share/doc/${PF}/html/faq.html"
-
-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
-
-	# make taglist ebuild aware, bug #66052
-	epatch ${FILESDIR}/${P}-ebuilds.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_setup() {
-	einfo "Cream comes with several dictionaries for spell checking. In"
-	einfo "all cases, at least a small English dictionary will be installed."
-	einfo " "
-	einfo "To specify which optional dictionaries are installed, set the"
-	einfo "LINGUAS variable in /etc/make.conf. For example, to install full"
-	einfo "English and French dictionaries, use:"
-	einfo "    LINGUAS=\"en fr\""
-	einfo " "
-	einfo "Available dictionaries are:"
-	for dict in "English en" "French fr" "German de" "Spanish es" ; do
-		# portage bug: shouldn't get a QA notice for linguas stuff...
-		einfo "    ${dict% *} \t(${dict#* }) $( ( \
-			use linguas_${dict#* } &>/dev/null && \
-			echo '(Will be installed)' ) || echo '(Will not be installed)' )"
-	done
-	einfo " "
-	# give the user time to cancel if necessary
-	epause
-}
-
diff --git a/app-vim/cream/files/cream-0.29-ctags.patch b/app-vim/cream/files/cream-0.29-ctags.patch
deleted file mode 100644
index fb535dd04ff5..000000000000
--- a/app-vim/cream/files/cream-0.29-ctags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr cream-0.29.orig/cream-lib.vim cream-0.29/cream-lib.vim
---- cream-0.29.orig/cream-lib.vim	2004-04-25 15:33:59.000000000 +0200
-+++ cream-0.29/cream-lib.vim	2004-04-25 20:18:40.775979986 +0200
-@@ -472,7 +472,7 @@
- 
- 	" program ctags exists
- 	elseif a:property == "ctags"
--		if executable("ctags") == 1 ||
-+		if executable("exuberant-ctags") == 1 ||
- 		\  executable("tags") == 1
- 			return 1
- 		endif
-diff -uNr cream-0.29.orig/taglist.vim cream-0.29/taglist.vim
---- cream-0.29.orig/taglist.vim	2004-04-25 15:33:59.000000000 +0200
-+++ cream-0.29/taglist.vim	2004-04-25 18:07:31.000000000 +0200
-@@ -97,7 +97,7 @@
- 
- " Location of the exuberant ctags tool
- if !exists('Tlist_Ctags_Cmd')
--    let Tlist_Ctags_Cmd = 'ctags'
-+    let Tlist_Ctags_Cmd = 'exuberant-ctags'
- endif
- 
- " Tag listing sort type - 'name' or 'order'
diff --git a/app-vim/cream/files/cream-0.29-desktop.patch b/app-vim/cream/files/cream-0.29-desktop.patch
deleted file mode 100644
index 249cc4b96852..000000000000
--- a/app-vim/cream/files/cream-0.29-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- cream-0.29.orig/cream.desktop	2004-04-25 15:33:59.000000000 +0200
-+++ cream-0.29/cream.desktop	2004-04-25 15:48:28.000000000 +0200
-@@ -12,5 +12,5 @@
- MapNotify=false
- Encoding=UTF-8
- X-Desktop-File-Install-Version=0.4
--Categories=Application;Development;X-Red-Hat-Base;
-+Categories=Application;Development;
- 
diff --git a/app-vim/cream/files/cream-0.29-paths.patch b/app-vim/cream/files/cream-0.29-paths.patch
deleted file mode 100644
index e07e8006980a..000000000000
--- a/app-vim/cream/files/cream-0.29-paths.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -uNr cream-0.29.orig/cream cream-0.29/cream
---- cream-0.29.orig/cream	2004-04-25 15:33:59.000000000 +0200
-+++ cream-0.29/cream	2004-04-25 15:34:17.000000000 +0200
-@@ -1,4 +1,4 @@
- #!/bin/sh
- 
--gvim -u "\$VIMRUNTIME/cream/creamrc" "$@"
-+gvim -u "\$VIM/cream/creamrc" "$@"
- 
---- cream-0.29.orig/creamrc	2004-04-25 15:33:59.000000000 +0200
-+++ cream-0.29/creamrc	2004-04-25 18:59:49.000000000 +0200
-@@ -103,7 +103,7 @@
- 			""***
- 
- 		else
--			let $CREAM = $VIMRUNTIME . "/cream/"
-+			let $CREAM = $VIM . "/cream/"
- 		endif
- 
- 	endif
-@@ -222,12 +222,13 @@
- 
- 			if has("win32")
- 				let quote = '"'
-+				" change slashes to backslashes for system call
-+				let tmpdir = substitute(mydir, '/', '\', 'g')
- 			else
- 				let quote = ''
-+				let tmpdir = mydir
- 			endif
- 			set noshellslash
--			" change slashes to backslashes for system call
--			let tmpdir = substitute(mydir, '/', '\', 'g')
- 			call system("mkdir " . quote . tmpdir . quote)
- 			set shellslash
- 
-@@ -284,12 +285,13 @@
- 
- 		if has("win32")
- 			let quote = '"'
-+			" change slashes to backslashes for system call
-+			let tmpdir = substitute(mydir, '/', '\', 'g')
- 		else
- 			let quote = ''
-+			let tmpdir = mydir
- 		endif
- 		set noshellslash
--		" change slashes to backslashes for system call
--		let tmpdir = substitute(mydir, '/', '\', 'g')
- 		call system("mkdir " . quote . tmpdir . quote)
- 		set shellslash
- 
-@@ -324,12 +326,13 @@
- 
- 			if has("win32")
- 				let quote = '"'
-+				" change slashes to backslashes for system call
-+				let tmpdir = substitute(mydir, '/', '\', 'g')
- 			else
- 				let quote = ''
-+				let tmpdir = mydir
- 			endif
- 			set noshellslash
--			" change slashes to backslashes for system call
--			let tmpdir = substitute(mydir, '/', '\', 'g')
- 			call system("mkdir " . quote . tmpdir . quote)
- 			set shellslash
diff --git a/app-vim/cream/files/cream-0.30-autocmd.patch b/app-vim/cream/files/cream-0.30-autocmd.patch
deleted file mode 100644
index 9cb731668bdb..000000000000
--- a/app-vim/cream/files/cream-0.30-autocmd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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.28 b/app-vim/cream/files/digest-cream-0.28
deleted file mode 100644
index 686f95a8d5b6..000000000000
--- a/app-vim/cream/files/digest-cream-0.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76d4969225374d187bd3c97a0d6a5197 cream-0.28.tar.gz 842062
diff --git a/app-vim/cream/files/digest-cream-0.29-r1 b/app-vim/cream/files/digest-cream-0.29-r1
deleted file mode 100644
index 2859bf6543c3..000000000000
--- a/app-vim/cream/files/digest-cream-0.29-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 8eadeb59f0cee34a3877a730cd048366 cream-0.29.tar.gz 846237
-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
diff --git a/app-vim/cream/files/digest-cream-0.30-r1 b/app-vim/cream/files/digest-cream-0.30-r1
deleted file mode 100644
index 3c95c534df46..000000000000
--- a/app-vim/cream/files/digest-cream-0.30-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/app-vim/cream/files/digest-cream-0.30-r2 b/app-vim/cream/files/digest-cream-0.30-r2
deleted file mode 100644
index 3c95c534df46..000000000000
--- a/app-vim/cream/files/digest-cream-0.30-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/app-vim/cream/files/digest-cream-0.30-r3 b/app-vim/cream/files/digest-cream-0.30-r3
deleted file mode 100644
index 3c95c534df46..000000000000
--- a/app-vim/cream/files/digest-cream-0.30-r3
+++ /dev/null
@@ -1,5 +0,0 @@
-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