Version bump. Added patches upto 140

12 files changed, 109 insertions, 10 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index da03371bb5ec..6d8758787064 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,6 @@
 # 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.41 2003/10/01 15:20:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.42 2003/11/01 01:09:54 rphillips Exp $
 
   01 Oct 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.2-r3.ebuild,
   gvim-6.2_pre1.ebuild, gvim-6.2_pre2.ebuild, gvim-6.2_pre3.ebuild,
@@ -11,6 +11,12 @@
   24 Sep 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.2-r3.ebuild:
   Mark stable on all arches
 
+*gvim-6.2-r5 (31 Oct 2003)
+
+  31 Oct 2003; Ryan Phillips <rphillips@gentoo.org> gvim-6.2-r5.ebuild:
+  added patches up to 140.  Skipped to -r5 to sync vim-core with vim/ 
+  and gvim/.
+
 *gvim-6.2-r3 (18 Sep 2003)
 
   18 Sep 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.2-r3.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 04bc76fa0e37..ca96c58a9b6c 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,11 +1,11 @@
 MD5 d8cd489e7277486a16866f7703e85c55 gvim-6.2-r3.ebuild 930
 MD5 94c48368a47fdf32a7939a52d43d0180 gvim-6.1-r6.ebuild 872
-MD5 782bb52244338bb5d17f0a936cc08dfe gvim-6.2-r5.ebuild 934
+MD5 1893e7f7efdada0f79b2da6ea9bbc79f gvim-6.2-r5.ebuild 935
 MD5 f17875a1bf4689022527ab0648eb8c24 gvim-6.1-r8.ebuild 1056
 MD5 c4f9c5f9afd0587e056327b51a98562f gvim-6.2-r2.ebuild 932
 MD5 879efa37a45838ffec830ce5dcf85da6 gvim-6.1-r7.ebuild 1016
 MD5 ba6de0b72017b2a1e5cf9a18b471e9fc gvim-6.2-r1.ebuild 934
-MD5 149a0996c1d58190eebd2b5327f2786e ChangeLog 7015
+MD5 b2c88742562ec64764a23f7120d9d8d4 ChangeLog 7016
 MD5 279c187f04873ccf322f266550829b2e gvim-6.2.ebuild 929
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
diff --git a/app-editors/gvim/files/digest-gvim-6.2-r5 b/app-editors/gvim/files/digest-gvim-6.2-r5
new file mode 100644
index 000000000000..ce0a5f5c1cc2
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.2-r5
@@ -0,0 +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 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
new file mode 100644
index 000000000000..f4b090f57c7f
--- /dev/null
+++ b/app-editors/gvim/gvim-6.2-r5.ebuild
@@ -0,0 +1,27 @@
+# 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.1 2003/11/01 01:09:54 rphillips Exp $
+
+inherit vim
+
+VIM_VERSION="6.2"
+VIM_GENTOO_PATCHES="vim-6.2.069-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.2.140-patches.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="Graphical Vim"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}
+	x11-base/xfree
+	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+		( gnome? ( gnome-base/gnome-libs ) :
+			( gtk? ( =x11-libs/gtk+-1.2* ) :
+				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 7932b8d005c0..376e2cc73d53 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.43 2003/10/07 23:53:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.44 2003/11/01 01:08:02 rphillips Exp $
 
   07 Oct 2003; Aron Griffis <agriffis@gentoo.org> files/vimrc:
   Use nomodeline instead of modelines=0
@@ -18,6 +18,13 @@
   19 Sep 2003; Christian Birchinger <joker@gentoo.org> vim-core-6.2-r3.ebuild:
   Added sparc stable keyword
 
+*vim-core-6.2-r5 (31 Oct 2003)
+
+  31 Oct 2003; Ryan Phillips <rphillips@gentoo.org> vim-core-6.2-r5.ebuild:
+  added patches up to 140.  Skipped to -r5 to sync vim-core with vim/ 
+  and gvim/.
+
+
 *vim-core-6.2-r4 (18 Sep 2003)
 
   18 Sep 2003; Aron Griffis <agriffis@gentoo.org> vim-core-6.2-r3.ebuild,
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 1824afba2e37..1d103a72c81d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -2,11 +2,11 @@ MD5 1e47754ccb2bbe0c1d4b2d62853c1982 vim-core-6.2.ebuild 794
 MD5 28a8bcc8f4ac7d78c166fb4804b14d19 vim-core-6.2-r1.ebuild 791
 MD5 be7adc4bfda484386f84d54e301cfd5a vim-core-6.1-r4.ebuild 767
 MD5 b1ff9c419fa27b783ddac67b1d58e79a vim-core-6.2-r3.ebuild 792
-MD5 ffbb24191b53da35aac813f11d96a08a vim-core-6.2-r5.ebuild 790
+MD5 ed1da123e24bfc937cfdc8d1111bf25f vim-core-6.2-r5.ebuild 799
 MD5 af9a024c24fa3d45a280428d49213d80 vim-core-6.2-r2.ebuild 796
 MD5 dd447381ccd30abe60b50dff86e2339a vim-core-6.1-r5.ebuild 773
 MD5 f6f5abdcd3ae258ccfd5483c0df45448 vim-core-6.2-r4.ebuild 790
-MD5 044c3b63a0aa3d6779d35df6e4897766 ChangeLog 6131
+MD5 9a8a47d44f9d60f3ee0b3778ec2d7d18 ChangeLog 6326
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 cc4d15465625e4d581e621d3d457d682 files/vimrc 2857
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
diff --git a/app-editors/vim-core/files/digest-vim-core-6.2-r5 b/app-editors/vim-core/files/digest-vim-core-6.2-r5
new file mode 100644
index 000000000000..c060c3a7a134
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.2-r5
@@ -0,0 +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 40f075e0a19fee12818efe1172ab9bc0 vim-6.2.140-patches.tar.bz2 192113
diff --git a/app-editors/vim-core/vim-core-6.2-r5.ebuild b/app-editors/vim-core/vim-core-6.2-r5.ebuild
new file mode 100644
index 000000000000..a2215625f86e
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.2-r5.ebuild
@@ -0,0 +1,20 @@
+# 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-core/vim-core-6.2-r5.ebuild,v 1.1 2003/11/01 01:08:02 rphillips Exp $
+
+inherit vim
+
+VIM_VERSION="6.2"
+VIM_GENTOO_PATCHES="vim-6.2.069-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.2.140-patches.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="vim and gvim shared files"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 42482c79be24..1d9b1837d73c 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,6 @@
 # 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.72 2003/10/01 15:26:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.73 2003/11/01 01:08:57 rphillips Exp $
 
   01 Oct 2003; Aron Griffis <agriffis@gentoo.org> vim-6.2-r3.ebuild,
   vim-6.2_pre1.ebuild, vim-6.2_pre2.ebuild, vim-6.2_pre3.ebuild,
@@ -11,6 +11,12 @@
   24 Sep 2003; Aron Griffis <agriffis@gentoo.org> vim-6.2-r3.ebuild:
   Mark stable on all arches
 
+*vim-6.2-r5 (31 Oct 2003)
+
+  31 Oct 2003; Ryan Phillips <rphillips@gentoo.org> vim-6.2-r5.ebuild:
+  added patches up to 140.  Skipped to -r5 to sync vim-core with vim/ 
+  and gvim/.
+
 *vim-6.2-r3 (18 Sep 2003)
 
   18 Sep 2003; Aron Griffis <agriffis@gentoo.org> vim-6.2-r3.ebuild:
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 915cd0ed12ae..4421d1ba4575 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,10 +1,10 @@
 MD5 e4aca125645ad7f0f7bcddf2f6a6caac vim-6.2-r3.ebuild 774
 MD5 207931daba6df8e786e1d670a779ccd5 vim-6.1-r19.ebuild 746
-MD5 0238f1584cefd43784e59c893f0f24ec vim-6.2-r5.ebuild 774
+MD5 570586d3c14b385b72551a94459a4141 vim-6.2-r5.ebuild 783
 MD5 afa117c01ab0971d1617cd2859de3c50 vim-6.1-r20.ebuild 752
 MD5 fc5912330f03be70f7e65e16ae039030 vim-6.2-r2.ebuild 768
 MD5 dab97fed6dad404ea6304849abaf860f vim-6.2-r1.ebuild 773
-MD5 4028374cac79fbd3e355afb8d20c6279 ChangeLog 12455
+MD5 af68a4c713e27216b8aced6ea927b5f6 ChangeLog 12639
 MD5 77766d8697a1591edafebfdf7328fc3a vim-6.1-r21.ebuild 752
 MD5 9244a0b045b3b65e3e9e427ac15a8b5f vim-6.2.ebuild 765
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
@@ -12,7 +12,6 @@ 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
 MD5 7872d6ce1d0728653a5d0ebd09d069ae files/digest-vim-6.2-r3 275
-MD5 a507670a2b078538a5ea936a1a4cb668 files/digest-vim-6.2-r4 275
 MD5 e92de6be4fb936ce511bfd13594c2cc5 files/digest-vim-6.2-r5 275
 MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 1d11d58beb06eea4047df9e2aac21b19 files/digest-vim-6.1-r19 276
diff --git a/app-editors/vim/files/digest-vim-6.2-r5 b/app-editors/vim/files/digest-vim-6.2-r5
new file mode 100644
index 000000000000..ce0a5f5c1cc2
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.2-r5
@@ -0,0 +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 f3858a1101cb55a42eca5576f42872df vim-6.2.140-patches.tar.bz2 213902
diff --git a/app-editors/vim/vim-6.2-r5.ebuild b/app-editors/vim/vim-6.2-r5.ebuild
new file mode 100644
index 000000000000..4a14d5bbd395
--- /dev/null
+++ b/app-editors/vim/vim-6.2-r5.ebuild
@@ -0,0 +1,22 @@
+# 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.1 2003/11/01 01:08:57 rphillips Exp $
+
+inherit vim
+
+VIM_VERSION="6.2"
+VIM_GENTOO_PATCHES="vim-6.2.069-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.2.140-patches.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="Vi IMproved!"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}"