6 files changed, 198 insertions, 21 deletions
diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 1cf4351a50d0..1e0220b8efbc 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-vim/cream
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.26 2005/04/24 11:56:51 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.27 2006/02/24 15:19:02 ciaranm Exp $
+
+*cream-0.34 (24 Feb 2006)
+
+  24 Feb 2006; Ciaran McCreesh <ciaranm@gentoo.org> cream-0.31.ebuild,
+  cream-0.32.ebuild, +cream-0.34.ebuild:
+  New version, thanks to TGL in bug #123153. Add missing unzip DEPENDS.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cream-0.32.ebuild:
   Stable on ppc.
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 12dc27a4a6b5..444ec3abd540 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bee0d3ddf24f20a17248e79d7983e0ad ChangeLog 4027
-RMD160 94575ee68d61a963f18f5bc130b82bb30d30a9fe ChangeLog 4027
-SHA256 b522b19a50d48f06dd6cef64c6e9f30f3cece7ce7169c5fb3de12afb031788e8 ChangeLog 4027
-MD5 015a45945478729840efcd7c40685dbb cream-0.31.ebuild 3268
-RMD160 0c343d070ff8c574634f6285d24dd82fce89c54e cream-0.31.ebuild 3268
-SHA256 0db169162abbd5f705bb62203a9754273eb90da0bd0881d62c915a7d3100c2b9 cream-0.31.ebuild 3268
-MD5 263ae2021a2c9c07401496d183fe7e97 cream-0.32.ebuild 3277
-RMD160 10a73882b203f8fc5f313fc32f83f981fb123c25 cream-0.32.ebuild 3277
-SHA256 db4a23719eb7886e1dedc320e8cee05314f8ec0ee5c4b59ff51410016e7fc9a1 cream-0.32.ebuild 3277
+MD5 6052c2bc82ce033cf868cb4cf464ced4 ChangeLog 4240
+RMD160 628f80c110c11fd28b14dd41fffcb5a8b2b070f8 ChangeLog 4240
+SHA256 faa7d3e97bb7034a416a31781d2678e8f2e910ae0cd5a79a73021fbdb2156e96 ChangeLog 4240
+MD5 93ef60a2722fbac936f2570ddd98b8c2 cream-0.31.ebuild 3281
+RMD160 06248b39ab55fb533d7c1fbf3942fe3bc06d3607 cream-0.31.ebuild 3281
+SHA256 6d06afed1f76d18bd070ca58f1ba55ca3a5cdc3c3f88cf675082efdc01c7d3fa cream-0.31.ebuild 3281
+MD5 ccc52c7a0805d49c7c7e0afa6980541a cream-0.32.ebuild 3290
+RMD160 43ea24e44bec15419405ca9f77a3303a734b9d8c cream-0.32.ebuild 3290
+SHA256 a31c0c89c9ce6d249df950a0c84a77ef6f3d2fded2b0775da0feb1c1044a0652 cream-0.32.ebuild 3290
+MD5 292ad19199c307729afa09486efee793 cream-0.34.ebuild 4303
+RMD160 6d83940cf7d8199e5bb995346b286dbdecbc2eb1 cream-0.34.ebuild 4303
+SHA256 e8ecebba3d02c8a63ff9c0c177d34a475846bbc369dc97478e81ab9c319c87fc cream-0.34.ebuild 4303
 MD5 d58213aa7bec744ebf8f3ac25e264c24 files/cream-0.30-ebuilds.patch 435
 RMD160 d4327ff5e6e54ef3e74da5bda8860d3e387fd4d1 files/cream-0.30-ebuilds.patch 435
 SHA256 b85b565e4430100fe5a41d6d1ba7c5c2de41b6c4712db8d8e5ce4a46de90adf4 files/cream-0.30-ebuilds.patch 435
@@ -22,13 +25,16 @@ SHA256 d18598604e484845e86f31aa5ac5378460c6a7a73ff814903537f6d0a4096bf4 files/di
 MD5 7c4f389627980e39478114829e29800e files/digest-cream-0.32 360
 RMD160 cea5457ceebe5f9909c9a4291ba5099062f9831f files/digest-cream-0.32 360
 SHA256 fe681eecebc44abf96cfe9ee18446044b4b448aa053694df2556eb70364fc759 files/digest-cream-0.32 360
+MD5 7683985291ec84a7bbbf236eb9348617 files/digest-cream-0.34 1313
+RMD160 8a486339456751badacf995ddb4f038b953c6607 files/digest-cream-0.34 1313
+SHA256 f5cf55b8b7fcabd47cbd7b2819329be9a7ac79b3d75b6f6c0f37c2142a289603 files/digest-cream-0.34 1313
 MD5 6a7797afc4b6b5487bf2ec3d53d81e6a metadata.xml 431
 RMD160 7a1541d4b0a3ee5bb8cc734dd385a317b65e2f41 metadata.xml 431
 SHA256 f8b6ad7fcb3088b1672d216ca4aa5860f588e6fa1bdcc3f7a0bd16a64e074eae metadata.xml 431
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD9rmnLLFUmVNQ7rkRAkcBAJ99XxPeyj7cUCqzGABcH1PRF6z5rgCgoniO
-o+lUAYDCudqrupK79C5bs1A=
-=LraR
+iD8DBQFD/yQJLLFUmVNQ7rkRAiUVAKDU0xxOMv9CzWznkaBpCqA5qHg4WACgvsn9
+OUJXxYf2rmpbT6A3pQIBpxY=
+=gR2N
 -----END PGP SIGNATURE-----
diff --git a/app-vim/cream/cream-0.31.ebuild b/app-vim/cream/cream-0.31.ebuild
index 177c89ad56aa..3a2860ae7233 100644
--- a/app-vim/cream/cream-0.31.ebuild
+++ b/app-vim/cream/cream-0.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.31.ebuild,v 1.4 2005/07/09 16:18:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.31.ebuild,v 1.5 2006/02/24 15:19:02 ciaranm Exp $
 
 inherit vim-plugin eutils
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ~ppc mips ~amd64"
 
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=">=app-editors/gvim-6.2
 	dev-util/ctags"
 
diff --git a/app-vim/cream/cream-0.32.ebuild b/app-vim/cream/cream-0.32.ebuild
index 399ed036239e..b9c193e51475 100644
--- a/app-vim/cream/cream-0.32.ebuild
+++ b/app-vim/cream/cream-0.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.32.ebuild,v 1.7 2005/07/09 16:18:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.32.ebuild,v 1.8 2006/02/24 15:19:02 ciaranm Exp $
 
 inherit vim-plugin eutils
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc mips amd64 alpha ia64"
 
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=">=app-editors/gvim-6.2
 	dev-util/ctags"
 
diff --git a/app-vim/cream/cream-0.34.ebuild b/app-vim/cream/cream-0.34.ebuild
new file mode 100644
index 000000000000..566f524ca45e
--- /dev/null
+++ b/app-vim/cream/cream-0.34.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.34.ebuild,v 1.1 2006/02/24 15:19:02 ciaranm Exp $
+
+inherit vim-plugin eutils fdo-mime
+
+DESCRIPTION="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-${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"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64 ~alpha ~ia64"
+
+DEPEND="
+	>=app-editors/gvim-6.4
+	app-arch/unzip"
+RDEPEND="
+	>=app-editors/gvim-6.4
+	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"
+
+# Utility function to rename a Vim help file and its links/anchors:
+#   prefix_help_file prefix file [pattern ...]
+prefix_help_file() {
+	local prefix="${1}" ; shift
+	local helpfile="${1}" ; shift
+	while [[ -n "${1}" ]] ; do
+		sed -i "s:\([*|]\)\(${1}[*|]\):\1${prefix}-\2:g" "${helpfile}" \
+			|| die "Failed to sed \"${1}\" on \"${helpfile}\""
+		shift
+	done
+	mv "${helpfile}" "${helpfile%/*}/${prefix}-${helpfile##*/}" \
+		|| die "Failed to rename \"${helpfile}\""
+}
+
+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 --noplugin -U NONE -u "\\\$VIM/cream/creamrc" "\$@"
+EOF
+	sed -i "/let \$CREAM/s:VIMRUNTIME:VIM:" creamrc || die "sed #1 broke"
+
+	# make taglist ebuild aware, bug #66052
+	epatch ${FILESDIR}/${PN}-0.30-ebuilds.patch
+
+	# rename vim help files to avoid conflicts with other vim packages
+	prefix_help_file cream help/EnhancedCommentify.txt \
+		'EnhancedCommentify' 'EnhComm-[a-zA-Z]\+'
+	prefix_help_file cream help/opsplorer.txt \
+		'opsplorer\.txt' 'opsplorer_[a-z_]\+'
+}
+
+src_install() {
+	# install launcher and menu entry
+	dobin cream
+	domenu cream.desktop
+	doicon cream.svg cream.png
+
+	# install shared vim files
+	insinto /usr/share/vim/cream
+	doins *.vim creamrc
+	local dir
+	for dir in addons bitmaps filetypes lang spelldicts ; do
+		insinto /usr/share/vim/cream/${dir}
+		doins ${dir}/*
+	done
+	insinto /usr/share/vim/vimfiles/doc
+	doins help/*.txt
+
+	# install docs
+	dodoc docs/{CHANGELOG,DEVELOPER,KEYBOARD,PressRelease,README,RELEASE}.txt
+	dohtml docs-html/*
+	# html doc may be opened from Cream GUI
+	dosym ../../doc/${PF}/html /usr/share/vim/cream/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
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	vim-plugin_pkg_postinst
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	vim-plugin_pkg_postrm
+}
diff --git a/app-vim/cream/files/digest-cream-0.34 b/app-vim/cream/files/digest-cream-0.34
new file mode 100644
index 000000000000..0d096d850c3d
--- /dev/null
+++ b/app-vim/cream/files/digest-cream-0.34
@@ -0,0 +1,15 @@
+MD5 a412b4c156c7b0a73a77740925f3c35b cream-0.34.tar.gz 1096752
+RMD160 ac9f39439031f7f69448c16f073bef4fef0076e2 cream-0.34.tar.gz 1096752
+SHA256 76a33c0ab931c0caf2247d7e66c5f1fa43e232ead5c05b65b4860dbd6f5f9655 cream-0.34.tar.gz 1096752
+MD5 e50dc96c6f79558e8680fbc2bec7b250 cream-spell-dict-eng_2.0.2.zip 1778434
+RMD160 9b963f601d9ce331e7553765f3e9a232e473e271 cream-spell-dict-eng_2.0.2.zip 1778434
+SHA256 fc1a117fa2ebf25254c503e31969f3b5584648965e3fdda3171995f64793ef51 cream-spell-dict-eng_2.0.2.zip 1778434
+MD5 8620c26f37e5484dd84c49a5e14102a1 cream-spell-dict-fre_2.1.zip 872841
+RMD160 28efaffd7a1325229aeb1e5aa85a4072df0a91ff cream-spell-dict-fre_2.1.zip 872841
+SHA256 d15039be170dadba0011915609446aa48e82e27d692c414be6427caa6134b0b7 cream-spell-dict-fre_2.1.zip 872841
+MD5 b2eac7ab57cd1d9dfd621bd0cfc9fc60 cream-spell-dict-ger_2.0.1.zip 894848
+RMD160 50321a0d6b22a5761c587c93269bf3b1908b6e48 cream-spell-dict-ger_2.0.1.zip 894848
+SHA256 62fbfa9ab7a42c4c0d8d7723f865be7e8c216b5215a15d7430ed0cfb3c993eae cream-spell-dict-ger_2.0.1.zip 894848
+MD5 2a9d85363a14bbc986eccbfa8accd4b1 cream-spell-dict-spa_3.0.zip 1710280
+RMD160 5418c029358b11bb339ca0b0dc0965e7381333b2 cream-spell-dict-spa_3.0.zip 1710280
+SHA256 b26ac0bbf905508b446cfb4424fad5923d4e5e6afe5cd20a313be67269485602 cream-spell-dict-spa_3.0.zip 1710280