Revbump. Add patch to fix Ctrl-O, bug 238544.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 30 insertions, 7 deletions

diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog
index f7502cea6f61..88ec10cd19fe 100644
--- a/app-vim/cream/ChangeLog
+++ b/app-vim/cream/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-vim/cream
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.41 2008/09/23 17:12:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.42 2008/09/25 13:46:29 hawking Exp $
+
+*cream-0.41-r2 (25 Sep 2008)
+
+  25 Sep 2008; Ali Polatel <hawking@gentoo.org>
+  +files/cream-0.41-ctrl-o.patch, -cream-0.41-r1.ebuild,
+  +cream-0.41-r2.ebuild:
+  Revbump. Add patch to fix Ctrl-O, bug 238544.
 
 *cream-0.41-r1 (23 Sep 2008)
 
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index b21dd7d2418f..9a8edfce876f 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX cream-0.30-ebuilds.patch 435 RMD160 d4327ff5e6e54ef3e74da5bda8860d3e387fd4d1 SHA1 5efe3f8f8753c550bb954566a7bb4c5cb2a22fca SHA256 b85b565e4430100fe5a41d6d1ba7c5c2de41b6c4712db8d8e5ce4a46de90adf4
+AUX cream-0.41-ctrl-o.patch 524 RMD160 7501c7369e71216c7ff044ef47f8e473437ea227 SHA1 218397055bf23eabea2cef95c3cca35ef1081889 SHA256 a21325adcbf0ef9f5525f48bfda5459e1434240733d6cf9c880aeccd54f0b6d5
 AUX cream.sh 128 RMD160 e2cd44db6947972522a4ef711ec69b3a78c9480e SHA1 d6d6f972e46171a2613f623bccde0efc67aaebbf SHA256 5ef28601b620113cdbf5a93810c77159c68782772ec4cf00feaada71aec31ce8
 AUX enhancedcommentify-2.1-extra-ft-support.patch 666 RMD160 8a431e2a575726a35394fe38222519a81a118df0 SHA1 ece3c13f742452563fb73218b3d2b549c11d47a0 SHA256 27868a8207886bdb31bc96ad22ebb461725c1d90a74a203c18bf35c1706ea75a
 AUX enhancedcommentify-2.1-gentooisms.patch 809 RMD160 97bb27cf1371719f4e8a82349688521117618a27 SHA1 010dd41bb36fa24460f8b7371b964464549148ac SHA256 bb0a2f338c5481e5e15afb6d438addc087c7fb7f594c28addadcde4c6de9e102
@@ -14,13 +15,13 @@ DIST cream-spell-dict-ger_2.0.1.zip 894848 RMD160 50321a0d6b22a5761c587c93269bf3
 DIST cream-spell-dict-spa_3.0.zip 1710280 RMD160 5418c029358b11bb339ca0b0dc0965e7381333b2 SHA1 00aa9d1dcb0000a34b4f6adfa894fa715251be11 SHA256 b26ac0bbf905508b446cfb4424fad5923d4e5e6afe5cd20a313be67269485602
 EBUILD cream-0.32.ebuild 3337 RMD160 40d392e1577a876aabc50d4e09e39563ee6e1bf6 SHA1 0b265ebef651795d9319f5b0c9e27be6c7221440 SHA256 d57d4cb8a406a16fd976e0f23a8261b5029803e8d434a4727dbfb17ad75973e6
 EBUILD cream-0.34.ebuild 4541 RMD160 7276acc2a5ca1b4859143bbdab1c97c824faa0fd SHA1 8f796afe12d187f2f4deb62c61ec4ea2e4e8188f SHA256 afe4b54d9d529311df1c479124c69c0779ea0841cca20e1bf6f1be4ed1e28cca
-EBUILD cream-0.41-r1.ebuild 4482 RMD160 f468b5893ddd02c6ea75b180ee18fd71ca072f0d SHA1 6d2c926da3bfb4131d47267a0d1ed5a59380cfee SHA256 35567acd19a72011ac892d2fb3f8287b88b14d202ffe262666c99b973a0a3e63
-MISC ChangeLog 5856 RMD160 293510faf508c10523c01a1ca6bf3495ffb3a257 SHA1 556a60d04a2ce411502d6a7a7aa7a080caa726fe SHA256 bdb5e7c2fe9bb1b696c22475bcf3816a714b548594ff1a9c5c3e3d5cbd946447
+EBUILD cream-0.41-r2.ebuild 4551 RMD160 be203ec43347a27a34fa753ca6b12bb4e86bec94 SHA1 530bc55373861784501daa2cbfda53992534e48e SHA256 186ecc1b586aecab4c68652aaa0ec7d541c48142fe3e77a62fa6b74b6428607b
+MISC ChangeLog 6065 RMD160 ace784eaf9bf4a63c83625bf1e72a96f6b4b1b59 SHA1 4e61d1b141d59932e0f55391316156f165c2046a SHA256 91ec31a292478f9e9f0f59e545aef2fa30cefaa44c2a426f4d0b4f7ceb923965
 MISC metadata.xml 431 RMD160 7a1541d4b0a3ee5bb8cc734dd385a317b65e2f41 SHA1 25f7000c98ff591e933456600b4f80f6dd4aae32 SHA256 f8b6ad7fcb3088b1672d216ca4aa5860f588e6fa1bdcc3f7a0bd16a64e074eae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjZI4oACgkQQU4yORhF8iAtOwCfRZT1UeTOQlLbLr9gBR6pWkcl
-jAsAnRx72Fl92JwZpXht+hEXGQhAaU3R
-=+/wO
+iEUEARECAAYFAkjblj4ACgkQQU4yORhF8iCQMwCYokW0u66g0X3pqloAuZNWNtgx
+pwCgjFgVis7WxW1Awlv5mONvtaR8eAo=
+=vR/V
 -----END PGP SIGNATURE-----
diff --git a/app-vim/cream/cream-0.41-r1.ebuild b/app-vim/cream/cream-0.41-r2.ebuild
index b917a02ed2b1..7f6d048dcc0a 100644
--- a/app-vim/cream/cream-0.41-r1.ebuild
+++ b/app-vim/cream/cream-0.41-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.41-r1.ebuild,v 1.1 2008/09/23 17:12:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.41-r2.ebuild,v 1.1 2008/09/25 13:46:29 hawking Exp $
 
 inherit vim-plugin eutils fdo-mime
 
@@ -91,9 +91,13 @@ EOF
 	epatch "${FILESDIR}"/enhancedcommentify-2.1-gentooisms.patch
 	epatch "${FILESDIR}"/enhancedcommentify-2.1-extra-ft-support.patch
 
+	# fix Ctrl+O, bug #238544
+	epatch "${FILESDIR}/${P}-ctrl-o.patch"
+
 	# rename vim help files to avoid conflicts with other vim packages
 	prefix_help_file cream help/EnhancedCommentify.txt \
 		'EnhancedCommentify' 'EnhComm-[a-zA-Z]\+'
+
 }
 
 src_install() {
diff --git a/app-vim/cream/files/cream-0.41-ctrl-o.patch b/app-vim/cream/files/cream-0.41-ctrl-o.patch
new file mode 100644
index 000000000000..e29508bac9bc
--- /dev/null
+++ b/app-vim/cream/files/cream-0.41-ctrl-o.patch
@@ -0,0 +1,11 @@
+--- cream-keys.vim.orig	2008-09-25 16:30:22.017054144 +0300
++++ cream-keys.vim	2008-09-25 16:30:45.901803810 +0300
+@@ -243,7 +243,7 @@
+ "**********************************************************************
+ " Note: This is only possible due to Key to Universe map at beginning!
+ "       Normally, <C-b> is a special Vim mapping.
+-inoremap <silent> <C-o> <C-b>:call Cream_file_open()<CR>
++imap <silent> <C-o> <C-b>:call Cream_file_open()<CR>
+ "**********************************************************************
+ "***
+