pull broken 0.29, add in 0.29-r1, #48960

10 files changed, 202 insertions, 174 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 0bc80eee0ee5..b860a9fa2ac3 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-vim/cream
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.6 2004/04/28 14:47:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.7 2004/04/29 06:06:04 ciaranm Exp $
+
+*cream-0.29-r1 (29 Apr 2004)
+
+  29 Apr 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/gentoo-cream-0.29-mkdir.patch,
+  +cream-0.29-r1.ebuild, -cream-0.29.ebuild:
+  Pulling 0.29 as it is broken. Adding in 0.29-r1 as ~arch. Thanks to TGL
+  <degrenier@easyconnect.fr> in #48960
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> cream-0.29.ebuild:
   Add inherit eutils
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 24a1f5854984..4099e85bdf92 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -1,7 +1,9 @@
-MD5 a7cd02afa5a388b8fa5f207855a7645e cream-0.28.ebuild 862
-MD5 1ec4445b80533d948f7f257565a41bea cream-0.29.ebuild 908
-MD5 186001a3e17b30fe41906fd2cd457aab ChangeLog 1128
+MD5 66089cc7932087dd99dc6b7fcc015867 cream-0.29-r1.ebuild 2056
+MD5 128f0b535035354cf871c465df920106 ChangeLog 1509
 MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
+MD5 a7cd02afa5a388b8fa5f207855a7645e cream-0.28.ebuild 862
+MD5 72e0247891a704fa4cbe72a221b62a56 files/cream-0.29-ctags.patch 825
+MD5 94138ab0e32dfd93c1412066535c1edf files/digest-cream-0.29-r1 347
+MD5 11a37b610fef3f6de7fca7058b1432e2 files/cream-0.29-paths.patch 1801
 MD5 b805bdc2fd56028f6182d4fe44cfb033 files/digest-cream-0.28 62
-MD5 80e16a323fe29f813a5f6eba26aacfb3 files/digest-cream-0.29 62
-MD5 84d1ffabb8cfe8079a46971510a5505e files/gentoo-cream-0.29-mkdir.patch 3245
+MD5 130945b9ad1e1413be8ede26054e2a91 files/cream-0.29-desktop.patch 313
diff --git a/app-vim/cream/cream-0.29-r1.ebuild b/app-vim/cream/cream-0.29-r1.ebuild
new file mode 100644
index 000000000000..2b3caf047bc1
--- /dev/null
+++ b/app-vim/cream/cream-0.29-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/29 06:06:04 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"
+
+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.29.ebuild b/app-vim/cream/cream-0.29.ebuild
deleted file mode 100644
index 092652209740..000000000000
--- a/app-vim/cream/cream-0.29.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.29.ebuild,v 1.2 2004/04/27 20:43:53 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"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~mips ppc"
-IUSE=""
-DEPEND=""
-RDEPEND=">=app-editors/gvim-6.2"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/gentoo-${P}-mkdir.patch
-	cd $S
-	# Make the install script handle it. Point it to the destination dir.
-	# We handle docs ourselves.
-	sed -i~ -e s:/usr/:${D}usr/:g -e /docs/d INSTALL.sh
-}
-src_install() {
-	cd $S
-	dodir /usr/bin /usr/share/icons /usr/share/applications
-	./INSTALL.sh
-	dodoc docs/*
-	dohtml docs-html/*
-}
diff --git a/app-vim/cream/files/cream-0.29-ctags.patch b/app-vim/cream/files/cream-0.29-ctags.patch
new file mode 100644
index 000000000000..fb535dd04ff5
--- /dev/null
+++ b/app-vim/cream/files/cream-0.29-ctags.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000000..249cc4b96852
--- /dev/null
+++ b/app-vim/cream/files/cream-0.29-desktop.patch
@@ -0,0 +1,9 @@
+--- 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
new file mode 100644
index 000000000000..e07e8006980a
--- /dev/null
+++ b/app-vim/cream/files/cream-0.29-paths.patch
@@ -0,0 +1,67 @@
+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/digest-cream-0.29 b/app-vim/cream/files/digest-cream-0.29
deleted file mode 100644
index f26d600febbb..000000000000
--- a/app-vim/cream/files/digest-cream-0.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8eadeb59f0cee34a3877a730cd048366 cream-0.29.tar.gz 846237
diff --git a/app-vim/cream/files/digest-cream-0.29-r1 b/app-vim/cream/files/digest-cream-0.29-r1
new file mode 100644
index 000000000000..2859bf6543c3
--- /dev/null
+++ b/app-vim/cream/files/digest-cream-0.29-r1
@@ -0,0 +1,5 @@
+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/gentoo-cream-0.29-mkdir.patch b/app-vim/cream/files/gentoo-cream-0.29-mkdir.patch
deleted file mode 100644
index 513ed0fe2973..000000000000
--- a/app-vim/cream/files/gentoo-cream-0.29-mkdir.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- cream-0.29-orig/creamrc	2004-04-15 02:11:15.000000000 +0200
-+++ cream-0.29/creamrc	2004-04-27 12:39:45.000000000 +0200
-@@ -36,6 +36,31 @@
- " paths determined manually (not by Vim) need to be reversed.
- set shellslash
- 
-+function! Cream_checkdir(dir)
-+
-+	" if directory doesn't exist, try to make it
-+	if isdirectory(a:dir) != 1
-+
-+		" system call prep
-+		if has("win32")
-+			" remove trailing slash (Win95)
-+			let tmp = substitute(a:dir, '\(\\\|/\)$', '', 'g')
-+
-+			" convert slashes to backslashes
-+			let tmp = substitute(tmp, '/', '\', 'g')
-+		else
-+			let tmp = a:dir
-+		endif
-+
-+		" mkdir (quote, regardless of spaces)
-+		set noshellslash
-+		call system("mkdir " . '"' . tmp . '"')
-+		set shellslash
-+
-+	endif
-+
-+endfunction
-+
- " path initializations
- " Cream_init() ($CREAM)   $VIMRUNTIME/cream {{{1
- function! Cream_init()
-@@ -151,21 +176,7 @@
- 		let mydir = mydir . '/.cream/'
- 
- 		" if directory doesn't exist, try to make it
--		if isdirectory(mydir) != 1
--
--			" system call prep
--			" remove trailing slash (Win95)
--			let tmp = substitute(mydir, '\(\\\|/\)$', '', 'g')
--
--			" convert slashes to backslashes
--			let tmp = substitute(tmp, '/', '\', 'g')
--
--			" mkdir (quote, regardless of spaces)
--			set noshellslash
--			call system("mkdir " . '"' . tmp . '"')
--			set shellslash
--
--		endif
-+		call Cream_checkdir(mydir)
- 
- 		" use if directory, writable
- 		if filewritable(mydir) == 2
-@@ -184,9 +195,7 @@
- 		let mydir = $HOME . "/.cream/"
- 
- 		" if doesn't exist, try to make it
--		if isdirectory(mydir) != 1
--			call system("mkdir " . mydir)
--		endif
-+		call Cream_checkdir(mydir)
- 
- 		" use if directory, writable
- 		if filewritable(mydir) == 2
-@@ -217,21 +226,7 @@
- 		" (remember, g:cream_user is simplified and escaped)
- 		let mydir = g:cream_user . "views"
- 
--		" if doesn't exist, attempt to make it
--		if isdirectory(mydir) != 1
--
--			if has("win32")
--				let quote = '"'
--			else
--				let quote = ''
--			endif
--			set noshellslash
--			" change slashes to backslashes for system call
--			let tmpdir = substitute(mydir, '/', '\', 'g')
--			call system("mkdir " . quote . tmpdir . quote)
--			set shellslash
--
--		endif
-+		call Cream_checkdir(mydir)
- 
- 		if filewritable(mydir) == 2
- 			" we set a script global, only so viminfo (following) can
-@@ -280,20 +275,7 @@
- 	let mydir = g:cream_user . "spelldicts"
- 
- 	" if doesn't exist, attempt to make it
--	if isdirectory(mydir) != 1
--
--		if has("win32")
--			let quote = '"'
--		else
--			let quote = ''
--		endif
--		set noshellslash
--		" change slashes to backslashes for system call
--		let tmpdir = substitute(mydir, '/', '\', 'g')
--		call system("mkdir " . quote . tmpdir . quote)
--		set shellslash
--
--	endif
-+	call Cream_checkdir(mydir)
- 
- 	if filewritable(mydir) != 2
- 		return -1
-@@ -320,20 +302,7 @@
- 		let mydir = g:cream_user . "tmp"
- 
- 		" if doesn't exist, attempt to make it
--		if isdirectory(mydir) != 1
--
--			if has("win32")
--				let quote = '"'
--			else
--				let quote = ''
--			endif
--			set noshellslash
--			" change slashes to backslashes for system call
--			let tmpdir = substitute(mydir, '/', '\', 'g')
--			call system("mkdir " . quote . tmpdir . quote)
--			set shellslash
--
--		endif
-+		call Cream_checkdir(mydir)
- 
- 		if filewritable(mydir) != 2
- 			return -1