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

6 files changed, 105 insertions, 136 deletions

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