Add fixed patch for 2.18, bug 238436, thanks to Andrew Savchenko <Bircoph@list.ru>.

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

4 files changed, 32 insertions, 8 deletions

diff --git a/app-vim/alternate/ChangeLog b/app-vim/alternate/ChangeLog
index e6c7e2b9f74b..f3358356e6da 100644
--- a/app-vim/alternate/ChangeLog
+++ b/app-vim/alternate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-vim/alternate
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/alternate/ChangeLog,v 1.40 2008/09/20 08:05:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/alternate/ChangeLog,v 1.41 2008/10/10 14:01:51 hawking Exp $
+
+  10 Oct 2008; Ali Polatel <hawking@gentoo.org>
+  +files/alternate-2.18-hh-cc-alternation.patch, alternate-2.18.ebuild:
+  Add fixed patch for 2.18, bug 238436, thanks to Andrew Savchenko
+  <Bircoph@list.ru>.
 
 *alternate-2.18 (20 Sep 2008)
 
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 141ecc84a967..27bbf95dc577 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX alternate-2.12-hh-cc-alternation.patch 938 RMD160 bf1b3e7ca787a52c6f16cb074a0dff4fdebbf011 SHA1 2272f10a06713cc34eaeea3bf6654cc16cdb5145 SHA256 ce5ce3f426c592592dbfcb1ec3a4488632c084c9880bdea9a5c88c839a6900bc
+AUX alternate-2.18-hh-cc-alternation.patch 914 RMD160 3e0ab10006b32aeb0edf676cdd8ab20f094e1ccd SHA1 ce32676538706f2e89c584a55e7d1eecbdbb6f8c SHA256 53de95ac4ad4353b2e69aa0bb8b177ee2e6f8adf1bbecc06ace1f2fd4565c4df
 DIST alternate-2.12.tar.bz2 5933 RMD160 c6074b816271acf1475fcf54f388dd7ce21813d2 SHA1 bd5df47e1d54c625ae22bed103810e5a99f00389 SHA256 79e36bc113eb47e67184d1dc5a4edf7cad6b4830dc3193b20581f4d912326ed6
 DIST alternate-2.15.tar.bz2 10025 RMD160 8ce7131bcf1f6474459140ad3dfb84cf71cdee10 SHA1 0b0cd33f23b7f5c37e220eddff138a3e1e7463c6 SHA256 80ec9e0e4719f25d31bcd4473565947824f4f61eecee84e026cd96661982519d
 DIST alternate-2.18.tar.bz2 7907 RMD160 44e1a7957528e3411287f9f486cf0da25ffac16d SHA1 fc7ccb9c5aa7acc0cfd66dabc798afad2b949b1e SHA256 2367638f93c6ce3681a6ad6d5c83f586cd6598abd9f0b20bf02c740ac0efb59e
 EBUILD alternate-2.12-r1.ebuild 804 RMD160 4a3f6e36072f0effd3b7e69292a1fc5d7db77e73 SHA1 353b0d2d32fb57e8723a3a32af29084c2aef64a5 SHA256 26e2ff62db1f00e77510831543f2c927ceadd55c632c603272e58392174ce937
 EBUILD alternate-2.15.ebuild 807 RMD160 28c36502cb6c852a36ef7b76811443c5c173a008 SHA1 3f7a10f073c712e57579a311af53838b53df7a87 SHA256 b4834a1533dbb4a4586da86b87af3ee336844329744f81e57f4da041c59d0a3a
-EBUILD alternate-2.18.ebuild 814 RMD160 74b8cc927ecfb38eead01df3428e76fdbaa6e5b6 SHA1 66c0af1f9d99ac9c3530207215e2879962365111 SHA256 375964308b4aef95cc75545cb90fc51b24e06c666a266fb037c8004d61ba01ae
-MISC ChangeLog 4582 RMD160 4b580e17261b052646703a29fb41e6e4e04ddbd6 SHA1 b3df64ef7a9b26ea373f19f40379136ed682c901 SHA256 ebade96a87ae1e6045a0ca2f42f23bf65acdf9581954ce7d650f84e5e396bcbb
+EBUILD alternate-2.18.ebuild 808 RMD160 6f5334497a0e85ee69dcbc5d68822badaec7d60f SHA1 3ae380e9ff21cdb82c1dec00fef0b6e146428883 SHA256 9c609f109211f881c5e9380f3dd429a05db6d34c887e4bdf583be228918660fd
+MISC ChangeLog 4791 RMD160 2e0d880fb6a549a805c71643161fcf71e085f571 SHA1 0455d17a0ea8e3b52f580ef25e09ec5f8116eb88 SHA256 29c9e4547a80ea13f621f285708f4efb5a00d25592a1d89fc3775cace493a990
 MISC metadata.xml 157 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a SHA1 22983b8e9ba3045d8ccbc2b14393423f7f05d2ee SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjUrtIACgkQQU4yORhF8iB4tQCgmkrsYuwapIh+4wEheklp1lPk
-hHMAnibNKtR2yAgdW5h69OBq+C0YpqL2
-=W03f
+iEUEARECAAYFAkjvYFkACgkQQU4yORhF8iChDwCXdN2+HbbDqUvCP8RMp7BUBmlZ
+WgCgruo8ApnRu3LFXouBfDH7sVjVzdw=
+=f5AU
 -----END PGP SIGNATURE-----
diff --git a/app-vim/alternate/alternate-2.18.ebuild b/app-vim/alternate/alternate-2.18.ebuild
index acffda22ad5b..75fb7c5dbb78 100644
--- a/app-vim/alternate/alternate-2.18.ebuild
+++ b/app-vim/alternate/alternate-2.18.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/alternate/alternate-2.18.ebuild,v 1.1 2008/09/20 08:05:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/alternate/alternate-2.18.ebuild,v 1.2 2008/10/10 14:01:51 hawking Exp $
 
 inherit vim-plugin eutils
 
@@ -20,5 +20,5 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# fix switching between .cc and .hh files, thanks ciaranm
-	epatch "${FILESDIR}"/${PN}-2.12-hh-cc-alternation.patch
+	epatch "${FILESDIR}"/${P}-hh-cc-alternation.patch
 }
diff --git a/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
new file mode 100644
index 000000000000..3ea591e1e2fe
--- /dev/null
+++ b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
@@ -0,0 +1,18 @@
+--- plugin/a.vim	2005-05-06 22:20:24.000000000 +0100
++++ plugin/a.vim	2005-06-20 15:45:45.000000000 +0100
+@@ -57,13 +57,14 @@
+ " Mappings for C and C++
+ call <SID>AddAlternateExtensionMapping('h',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('H',"C,CPP,CXX,CC")
++call <SID>AddAlternateExtensionMapping('hh',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('hpp',"cpp,c")
+ call <SID>AddAlternateExtensionMapping('HPP',"CPP,C")
+ call <SID>AddAlternateExtensionMapping('c',"h")
+ call <SID>AddAlternateExtensionMapping('C',"H")
+ call <SID>AddAlternateExtensionMapping('cpp',"h,hpp")
+ call <SID>AddAlternateExtensionMapping('CPP',"H,HPP")
+-call <SID>AddAlternateExtensionMapping('cc',"h")
++call <SID>AddAlternateExtensionMapping('cc',"h,hh")
+ call <SID>AddAlternateExtensionMapping('CC',"H,h")
+ call <SID>AddAlternateExtensionMapping('cxx',"h")
+ call <SID>AddAlternateExtensionMapping('CXX',"H")