Improve EnhancedCommentify. Thanks to TGL in bug #124395.

(Portage version: 2.1_pre5-r1)

5 files changed, 56 insertions, 15 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index 1e0220b8efbc..8a14d49d8300 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-vim/cream
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.28 2006/02/28 15:32:55 ciaranm Exp $
+
+  28 Feb 2006; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/enhancedcommentify-2.1-extra-ft-support.patch,
+  +files/enhancedcommentify-2.1-gentooisms.patch, cream-0.34.ebuild:
+  Improve EnhancedCommentify. Thanks to TGL in bug #124395.
 
 *cream-0.34 (24 Feb 2006)
 
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 444ec3abd540..cf19f3676996 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6052c2bc82ce033cf868cb4cf464ced4 ChangeLog 4240
 RMD160 628f80c110c11fd28b14dd41fffcb5a8b2b070f8 ChangeLog 4240
 SHA256 faa7d3e97bb7034a416a31781d2678e8f2e910ae0cd5a79a73021fbdb2156e96 ChangeLog 4240
@@ -10,9 +7,9 @@ SHA256 6d06afed1f76d18bd070ca58f1ba55ca3a5cdc3c3f88cf675082efdc01c7d3fa cream-0.
 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 999ab4a7060776d92bd1276a114319ca cream-0.34.ebuild 4498
+RMD160 b4924e682742cb496072ce97ce1c574b6dc8c724 cream-0.34.ebuild 4498
+SHA256 2822623ca5e4d56a7e15a2df2dab265eaaec33220a37463ba369bc419f075ca5 cream-0.34.ebuild 4498
 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
@@ -28,13 +25,12 @@ SHA256 fe681eecebc44abf96cfe9ee18446044b4b448aa053694df2556eb70364fc759 files/di
 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 dd0734694fa4df5fae67151ea28c0bb4 files/enhancedcommentify-2.1-extra-ft-support.patch 666
+RMD160 8a431e2a575726a35394fe38222519a81a118df0 files/enhancedcommentify-2.1-extra-ft-support.patch 666
+SHA256 27868a8207886bdb31bc96ad22ebb461725c1d90a74a203c18bf35c1706ea75a files/enhancedcommentify-2.1-extra-ft-support.patch 666
+MD5 a7f84bad8ce3a8e9217114e1cf3449d8 files/enhancedcommentify-2.1-gentooisms.patch 809
+RMD160 97bb27cf1371719f4e8a82349688521117618a27 files/enhancedcommentify-2.1-gentooisms.patch 809
+SHA256 bb0a2f338c5481e5e15afb6d438addc087c7fb7f594c28addadcde4c6de9e102 files/enhancedcommentify-2.1-gentooisms.patch 809
 MD5 6a7797afc4b6b5487bf2ec3d53d81e6a metadata.xml 431
 RMD160 7a1541d4b0a3ee5bb8cc734dd385a317b65e2f41 metadata.xml 431
 SHA256 f8b6ad7fcb3088b1672d216ca4aa5860f588e6fa1bdcc3f7a0bd16a64e074eae metadata.xml 431
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/yQJLLFUmVNQ7rkRAiUVAKDU0xxOMv9CzWznkaBpCqA5qHg4WACgvsn9
-OUJXxYf2rmpbT6A3pQIBpxY=
-=gR2N
------END PGP SIGNATURE-----
diff --git a/app-vim/cream/cream-0.34.ebuild b/app-vim/cream/cream-0.34.ebuild
index 566f524ca45e..6cbd757252b2 100644
--- a/app-vim/cream/cream-0.34.ebuild
+++ b/app-vim/cream/cream-0.34.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.34.ebuild,v 1.2 2006/02/28 15:32:55 ciaranm Exp $
 
 inherit vim-plugin eutils fdo-mime
 
@@ -87,6 +87,10 @@ EOF
 	# make taglist ebuild aware, bug #66052
 	epatch ${FILESDIR}/${PN}-0.30-ebuilds.patch
 
+	# more filetypes for EnhancedCommentify, including the Gentoo ones
+	epatch ${FILESDIR}/enhancedcommentify-2.1-gentooisms.patch
+	epatch ${FILESDIR}/enhancedcommentify-2.1-extra-ft-support.patch
+
 	# rename vim help files to avoid conflicts with other vim packages
 	prefix_help_file cream help/EnhancedCommentify.txt \
 		'EnhancedCommentify' 'EnhComm-[a-zA-Z]\+'
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
new file mode 100644
index 000000000000..597518a6d547
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
@@ -0,0 +1,13 @@
+--- plugin/EnhancedCommentify.vim.orig	2005-03-01 02:28:23.409962824 -0500
++++ plugin/EnhancedCommentify.vim	2005-03-01 02:29:45.695453528 -0500
+@@ -740,7 +740,9 @@
+ 		\ 'psf\|ptcap\|r\|radiance\|ratpoison\|readline\remind\|'.
+ 		\ 'ruby\|screen\|sed\|sm\|snnsnet\|snnspat\|snnsres\|spec\|'.
+ 		\ 'squid\|terminfo\|tidy\|tli\|tsscl\|vgrindefs\|vrml\|'.
+-		\ 'wget\|wml\|xf86conf\|xmath\)$'
++		\ 'wget\|wml\|xf86conf\|xmath\|fstab\|apache\|resolv\|sudoers\|'.
++		\ 'ntp\|mailcap\|ssh_config\|sshdconfig\|mplayerconf\|desktop\|'.
++		\ 'gkrellmrc\|pf\|ipfilter\|grub\|fluxbox\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
+     elseif fileType =~ 'gentoo'
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
new file mode 100644
index 000000000000..9e45142ff8ae
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
@@ -0,0 +1,23 @@
+--- plugin/EnhancedCommentify.vim.orig	2005-01-27 00:20:00.049461056 -0500
++++ plugin/EnhancedCommentify.vim	2005-01-27 00:17:57.617073608 -0500
+@@ -628,6 +628,10 @@
+     " letter.
+     if match(synFiletype, '\l\+\u') == 0
+ 	let ft = substitute(synFiletype, '^\(\l\+\)\u.*$', '\1', "")
++    " work-around for gentoo-syntax stuff ; won't work with the above
++    " case, since all the identifiers start with a capital 'G'
++    elseif synFiletype =~ "GentooPackage*"
++	let ft = "gentoo"
+     endif
+ 
+     if ft == ""
+@@ -739,6 +743,9 @@
+ 		\ 'wget\|wml\|xf86conf\|xmath\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
++    elseif fileType =~ 'gentoo'
++	let b:ECcommentOpen = '#'
++	let b:ECcommentClose = ''
+     elseif fileType == 'webmacro'
+ 	let b:ECcommentOpen = '##'
+ 	let b:ECcommentClose = ''