fix bug 34505

7 files changed, 30 insertions, 14 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 5bdf56921823..53e12ce31c71 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.49 2003/12/04 23:59:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.50 2003/12/08 03:40:09 agriffis Exp $
+
+  07 Dec 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.2-r5.ebuild:
+  Use vim-6.2.140-gentoo-patches.tar.bz2 to fix bug 34505: Patch
+  008_all_vim-6.2-slrnrc.patch is removed (it was never applying anyway!) and
+  009_all_vim-6.2-egrep.patch.gz is added to fix building with
+  WANT_AUTOCONF_2_5. I'll be pushing this patch upstream...
 
   04 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> gvim-6.2-r5.ebuild:
   Stable on sparc
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 2a017af30ada..ced094bf6368 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,9 +1,13 @@
 MD5 f2ecc233a892f599d2b98949b9124ea7 gvim-6.2-r3.ebuild 939
-MD5 55e8dbacc9363b285091528d7ebccb37 gvim-6.2-r5.ebuild 951
+MD5 94a244fc2f5bb2c8c4ec23c42b47ef8f gvim-6.2-r5.ebuild 952
 MD5 ce7c84ed7b2d35c6982b83fc38f22d39 gvim-6.2-r2.ebuild 941
 MD5 62fa78205f3d84dd8ecb79e8cc0e5fec gvim-6.2-r1.ebuild 943
-MD5 61d8ffb8203b73611230b47c7fa52549 ChangeLog 7840
+MD5 4c20d0e3265909c6c51e3b1a96ba21b1 ChangeLog 8178
 MD5 e3c57a81c035f056da9ec0bc740115ee gvim-6.2.ebuild 938
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
+MD5 38a359b4a00f99fcecd10986eb83a691 files/digest-gvim-6.2-r1 274
+MD5 581974f7e2a2c4054b563db39720cc32 files/digest-gvim-6.2-r2 274
+MD5 7872d6ce1d0728653a5d0ebd09d069ae files/digest-gvim-6.2-r3 275
 MD5 716afe9892b4d31cf62493a0352a3c71 files/digest-gvim-6.2-r5 275
diff --git a/app-editors/gvim/files/digest-gvim-6.2-r5 b/app-editors/gvim/files/digest-gvim-6.2-r5
index ce0a5f5c1cc2..e6a373428310 100644
--- a/app-editors/gvim/files/digest-gvim-6.2-r5
+++ b/app-editors/gvim/files/digest-gvim-6.2-r5
@@ -1,4 +1,4 @@
 MD5 c49d360bbd069d00e2a57804f2a123d9 vim-6.2.tar.bz2 3269791
 MD5 aa0079938f636d08be71078933477d8b vim-6.2-lang.tar.gz 1093788
-MD5 b353829e1201637a64b6569fcff841de vim-6.2.069-gentoo-patches.tar.bz2 4005
+MD5 ecf735c0107c401efc3eca0755b28b8b vim-6.2.140-gentoo-patches.tar.bz2 3126
 MD5 f3858a1101cb55a42eca5576f42872df vim-6.2.140-patches.tar.bz2 213902
diff --git a/app-editors/gvim/gvim-6.2-r5.ebuild b/app-editors/gvim/gvim-6.2-r5.ebuild
index a6db7ce9330f..359594c99c15 100644
--- a/app-editors/gvim/gvim-6.2-r5.ebuild
+++ b/app-editors/gvim/gvim-6.2-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.5 2003/12/04 23:59:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.6 2003/12/08 03:40:09 agriffis Exp $
 
 inherit vim
 
 VIM_VERSION="6.2"
-VIM_GENTOO_PATCHES="vim-6.2.069-gentoo-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-6.2.140-gentoo-patches.tar.bz2"
 VIM_ORG_PATCHES="vim-6.2.140-patches.tar.bz2"
 
 SRC_URI="${SRC_URI}
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 5ace410f5d2e..524a33270b71 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.77 2003/12/04 22:18:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.78 2003/12/08 03:41:14 agriffis Exp $
+
+  07 Dec 2003; Aron Griffis <agriffis@gentoo.org> vim-6.2-r5.ebuild:
+  Use vim-6.2.140-gentoo-patches.tar.bz2 to fix bug 34505: Patch
+  008_all_vim-6.2-slrnrc.patch is removed (it was never applying anyway!) and
+  009_all_vim-6.2-egrep.patch.gz is added to fix building with
+  WANT_AUTOCONF_2_5. I'll be pushing this patch upstream...
 
   04 Dec 2003; <agriffis@gentoo.org> vim-6.2-r5.ebuild:
   Mark stable on alpha, sparc, x86
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 84739fc2ae03..637162ae7bf1 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,10 +1,10 @@
-MD5 1f2ea72f27f2c07ecfd0d015745171f3 ChangeLog 12951
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 dab97fed6dad404ea6304849abaf860f vim-6.2-r1.ebuild 773
-MD5 fc5912330f03be70f7e65e16ae039030 vim-6.2-r2.ebuild 768
 MD5 e4aca125645ad7f0f7bcddf2f6a6caac vim-6.2-r3.ebuild 774
-MD5 2037b370f61441baa53fe7b3524d3aa9 vim-6.2-r5.ebuild 784
+MD5 071b5a736b35ff942f3e68434754a1f0 vim-6.2-r5.ebuild 784
+MD5 fc5912330f03be70f7e65e16ae039030 vim-6.2-r2.ebuild 768
+MD5 dab97fed6dad404ea6304849abaf860f vim-6.2-r1.ebuild 773
+MD5 fa8bbbd42f4f47ca5089e43515f217a5 ChangeLog 13287
 MD5 9244a0b045b3b65e3e9e427ac15a8b5f vim-6.2.ebuild 765
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-vim-6.2 274
 MD5 38a359b4a00f99fcecd10986eb83a691 files/digest-vim-6.2-r1 274
 MD5 581974f7e2a2c4054b563db39720cc32 files/digest-vim-6.2-r2 274
diff --git a/app-editors/vim/vim-6.2-r5.ebuild b/app-editors/vim/vim-6.2-r5.ebuild
index 5f34ce38709b..3f29953cc082 100644
--- a/app-editors/vim/vim-6.2-r5.ebuild
+++ b/app-editors/vim/vim-6.2-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.2-r5.ebuild,v 1.3 2003/12/04 22:18:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.2-r5.ebuild,v 1.4 2003/12/08 03:41:14 agriffis Exp $
 
 inherit vim
 
 VIM_VERSION="6.2"
-VIM_GENTOO_PATCHES="vim-6.2.069-gentoo-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-6.2.140-gentoo-patches.tar.bz2"
 VIM_ORG_PATCHES="vim-6.2.140-patches.tar.bz2"
 
 SRC_URI="${SRC_URI}