new vim7 goodness

(Portage version: 2.0.51.19 small furry bundle of death edition)

31 files changed, 261 insertions, 284 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index f227e0078a40..6f2d660f8a97 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.115 2005/03/06 12:21:53 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.116 2005/03/08 21:46:19 ciaranm Exp $
+
+*gvim-7.0_alpha20050308 (08 Mar 2005)
+
+  08 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/gvim-completion,
+  +files/gvimrc-r1, -gvim-7.0_alpha20050122.ebuild,
+  -gvim-7.0_alpha20050126.ebuild, -gvim-7.0_alpha20050201.ebuild,
+  +gvim-7.0_alpha20050308.ebuild:
+  Updated vim7 snapshot
 
   06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> gvim-6.3-r4.ebuild:
   Marked stable on amd64.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index d62b89b77c4f..6844f471c340 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2bf3627d58fc5bc11e7deaebec4211c5 gvim-6.3-r2.ebuild 1084
-MD5 3dd72c20661eb49ddd32c14d09bf02af gvim-6.3-r4.ebuild 1081
 MD5 9477ed9dd58929c9cfe99dd578915242 gvim-7.0_alpha20050122.ebuild 1244
-MD5 86bd7823fdad465524ac22197238b468 gvim-7.0_alpha20050126.ebuild 1244
+MD5 3dd72c20661eb49ddd32c14d09bf02af gvim-6.3-r4.ebuild 1081
 MD5 3caba7bb753d0a55259cbb129add6a70 ChangeLog 16522
+MD5 bf3d506faa9d4f4ac788d0b4a21c7d2e gvim-7.0_alpha20050308.ebuild 1236
+MD5 2bf3627d58fc5bc11e7deaebec4211c5 gvim-6.3-r2.ebuild 1084
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 71cbe15650ab749cfca996cf00415ec6 gvim-7.0_alpha20050201.ebuild 1244
-MD5 0b89dd827cc960494cb2957014735635 files/digest-gvim-7.0_alpha20050122 156
-MD5 757e84cb9ddfcb550eb62e3f322fafbb files/digest-gvim-7.0_alpha20050126 156
-MD5 bbf20c81c19c38b574fff1e7199915d5 files/digest-gvim-7.0_alpha20050201 156
-MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
-MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
+MD5 86bd7823fdad465524ac22197238b468 gvim-7.0_alpha20050126.ebuild 1244
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
-MD5 a2735085bae19b43fbae5e0ef41b2efb files/gvim-completion 1187
+MD5 5ec36efe555989747f6845c93422a6fc files/gvimrc-r1 955
+MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
+MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
+MD5 cd8f7c341b95e8d34a705bd2efa9865e files/digest-gvim-7.0_alpha20050308 156
+MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
+MD5 0b89dd827cc960494cb2957014735635 files/digest-gvim-7.0_alpha20050122 156
 MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-gvim-6.3-r2 274
+MD5 bbf20c81c19c38b574fff1e7199915d5 files/digest-gvim-7.0_alpha20050201 156
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-gvim-6.3-r4 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCKvX/ntT9W3vfTuoRAnlaAKCBd5DNYpgiQ4CeoK58148hjw1HgQCfdjv9
-hwX4vYJqLt5XgaL2RdLr/lE=
-=mYEx
------END PGP SIGNATURE-----
+MD5 757e84cb9ddfcb550eb62e3f322fafbb files/digest-gvim-7.0_alpha20050126 156
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050122 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050122
deleted file mode 100644
index ccbe8cc6fe2b..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050122
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ee9920bc069fcf1ca24ea76a61b6fb0f vim-7.0aa-20050122.tar.bz2 5295756
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050126 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050126
deleted file mode 100644
index cf51cf7938b1..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050126
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4fe31ad17eaf667071db6393b157ccdf vim-7.0aa-20050126.tar.bz2 5321486
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050201 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050201
deleted file mode 100644
index b935821378ea..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050201
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 241b285eac58eb1db01a56a93842fa3f vim-7.0aa-20050201.tar.bz2 5324664
-MD5 6a8bd6cbc0c871259795c12ff30fb111 vim-7.0aa-20050201-gentoo-patches.tar.bz2 6701
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050308 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050308
new file mode 100644
index 000000000000..fe215979d5f3
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-7.0_alpha20050308
@@ -0,0 +1,2 @@
+MD5 43cd1bcd12011b2fec0edce3f047e801 vim-7.0aa-20050308.tar.bz2 5449810
+MD5 1e8ed0edb94933f9a5bcac4886d0ae23 vim-7.0aa-20050308-gentoo-patches.tar.bz2 6671
diff --git a/app-editors/gvim/files/gvim-completion b/app-editors/gvim/files/gvim-completion
index 1569bcf5af24..f19ce6f9780a 100644
--- a/app-editors/gvim/files/gvim-completion
+++ b/app-editors/gvim/files/gvim-completion
@@ -35,6 +35,6 @@ _gvim()
     fi
 }
 
-complete -F _gvim gvim gview rgview rgview
+complete -o filenames -F _gvim gvim gview rgview rgview
 
 # vim: set ft=sh sw=4 et sts=4 :
diff --git a/app-editors/gvim/files/gvimrc-r1 b/app-editors/gvim/files/gvimrc-r1
new file mode 100644
index 000000000000..200f6150650b
--- /dev/null
+++ b/app-editors/gvim/files/gvimrc-r1
@@ -0,0 +1,29 @@
+scriptencoding utf-8
+" ^^ Please leave the above line at the start of the file.
+
+" Default configuration file for gvim
+" $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/files/gvimrc-r1,v 1.1 2005/03/08 21:46:19 ciaranm Exp $
+"
+" Written by Aron Griffis <agriffis@gentoo.org>
+"
+" This file is read AFTER normal Vim initializations, like reading your .vimrc
+" file (and the default /usr/share/vim/vimrc).  So there's no reason to
+" duplicate settings from vimrc.  Red Hat has had this wrong for years, to the
+" great annoyance of users.
+
+" Pre-GUI settings
+set columns=80 lines=30       " don't inherit geometry from parent term
+set mousemodel=popup          " right mouse button pops up a menu in the GUI
+
+" Use a sufficiently wide window automatically when started as "gvimdiff"
+if (&foldmethod == 'diff')
+	set columns=165
+endif
+
+" For bug 33327, add a mapping which allows shift-insert to function
+" as expected in insert and command-line modes
+map! <s-insert> <c-r>*
+
+if filereadable("/etc/vim/gvimrc.local")
+  source /etc/vim/gvimrc.local
+endif
diff --git a/app-editors/gvim/gvim-7.0_alpha20050122.ebuild b/app-editors/gvim/gvim-7.0_alpha20050122.ebuild
deleted file mode 100644
index 985625b58013..000000000000
--- a/app-editors/gvim/gvim-7.0_alpha20050122.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050122.ebuild,v 1.1 2005/01/22 21:00:22 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~alpha"
-IUSE="${IUSE} gnome gtk gtk2 motif nextaw qt"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	virtual/x11
-	!aqua? (
-		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.4
-				virtual/xft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk2? (
-				gnome? ( gnome-base/gnome-libs )
-				!gnome? ( =x11-libs/gtk+-1.2* )
-			)
-		)
-		!gtk? (
-			qt? (
-				>=kde-base/kdelibs-3.3.1
-			)
-			!qt? (
-				motif? (
-					x11-libs/openmotif
-				)
-				!motif? (
-					nextaw? (
-						x11-libs/neXtaw
-					)
-				)
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.0_alpha20050201.ebuild b/app-editors/gvim/gvim-7.0_alpha20050201.ebuild
deleted file mode 100644
index 2cb418198552..000000000000
--- a/app-editors/gvim/gvim-7.0_alpha20050201.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050201.ebuild,v 1.1 2005/02/01 19:16:20 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050201"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~alpha"
-IUSE="${IUSE} gnome gtk gtk2 motif nextaw qt"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	virtual/x11
-	!aqua? (
-		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.4
-				virtual/xft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk2? (
-				gnome? ( gnome-base/gnome-libs )
-				!gnome? ( =x11-libs/gtk+-1.2* )
-			)
-		)
-		!gtk? (
-			qt? (
-				>=kde-base/kdelibs-3.3.1
-			)
-			!qt? (
-				motif? (
-					x11-libs/openmotif
-				)
-				!motif? (
-					nextaw? (
-						x11-libs/neXtaw
-					)
-				)
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.0_alpha20050126.ebuild b/app-editors/gvim/gvim-7.0_alpha20050308.ebuild
index e1264b12a761..5990159dda2b 100644
--- a/app-editors/gvim/gvim-7.0_alpha20050126.ebuild
+++ b/app-editors/gvim/gvim-7.0_alpha20050308.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050126.ebuild,v 1.1 2005/01/26 21:02:25 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050308.ebuild,v 1.1 2005/03/08 21:46:19 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
 
 VIM_VERSION="7.0aa"
 VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
 VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
+GVIMRC_FILE_SUFFIX="-r1"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${VIM_SNAPSHOT}
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 6b4a5dfeedb1..60e068ed8656 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.135 2005/03/06 12:19:17 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.136 2005/03/08 21:44:19 ciaranm Exp $
+
+*vim-core-7.0_alpha20050308 (08 Mar 2005)
+
+  08 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +files/vimrc-r1,
+  -vim-core-7.0_alpha20050122.ebuild, -vim-core-7.0_alpha20050126.ebuild,
+  -vim-core-7.0_alpha20050201.ebuild, +vim-core-7.0_alpha20050308.ebuild:
+  Updated vim7 snapshot
 
   06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> vim-core-6.3-r4.ebuild:
   Marked stable on amd64.
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index d22c3862f7ce..85ec6dbf3f42 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5e9dc8a98f0d1234fb8c2324a385c8ab vim-core-6.3-r3.ebuild 901
+MD5 03a3a0cb26a75360f1a030a6a94e9a21 ChangeLog 18124
 MD5 6fd53d5af0a1e65f23697bdf4651d7c3 vim-core-7.0_alpha20050201.ebuild 838
+MD5 4a6410918b9e57612b581684dae8b192 vim-core-7.0_alpha20050126.ebuild 838
 MD5 f178e8dd0f504553699bfc11ac59ecff vim-core-7.0_alpha20050122.ebuild 838
-MD5 6728cc483bc7c8b1ae517b2685d4a780 vim-core-6.3-r4.ebuild 948
-MD5 03a3a0cb26a75360f1a030a6a94e9a21 ChangeLog 18124
+MD5 5e9dc8a98f0d1234fb8c2324a385c8ab vim-core-6.3-r3.ebuild 901
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 4a6410918b9e57612b581684dae8b192 vim-core-7.0_alpha20050126.ebuild 838
-MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 d37ab681d38f38c8e73844f501eab162 vim-core-7.0_alpha20050308.ebuild 829
+MD5 6728cc483bc7c8b1ae517b2685d4a780 vim-core-6.3-r4.ebuild 948
+MD5 cd8f7c341b95e8d34a705bd2efa9865e files/digest-vim-core-7.0_alpha20050308 156
 MD5 0b89dd827cc960494cb2957014735635 files/digest-vim-core-7.0_alpha20050122 156
+MD5 852905ed26e8556d851694f7e696975c files/vimrc-r1 5630
+MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
+MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 MD5 757e84cb9ddfcb550eb62e3f322fafbb files/digest-vim-core-7.0_alpha20050126 156
 MD5 bbf20c81c19c38b574fff1e7199915d5 files/digest-vim-core-7.0_alpha20050201 156
-MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
-MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
-MD5 2fa89e2e9fd73c3778073f18e6836be8 files/digest-vim-core-6.3-r4 348
 MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCKvVintT9W3vfTuoRAms8AJ9vIkLBnNjhwxUrGTAe9ML75+7BZACgsZ9e
-DepkRJu9rQ8SzM1dKx//gcU=
-=SedW
------END PGP SIGNATURE-----
+MD5 2fa89e2e9fd73c3778073f18e6836be8 files/digest-vim-core-6.3-r4 348
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050122 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050122
deleted file mode 100644
index ccbe8cc6fe2b..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050122
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ee9920bc069fcf1ca24ea76a61b6fb0f vim-7.0aa-20050122.tar.bz2 5295756
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050126 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050126
deleted file mode 100644
index cf51cf7938b1..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050126
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4fe31ad17eaf667071db6393b157ccdf vim-7.0aa-20050126.tar.bz2 5321486
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050201 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050201
deleted file mode 100644
index b935821378ea..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050201
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 241b285eac58eb1db01a56a93842fa3f vim-7.0aa-20050201.tar.bz2 5324664
-MD5 6a8bd6cbc0c871259795c12ff30fb111 vim-7.0aa-20050201-gentoo-patches.tar.bz2 6701
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050308 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050308
new file mode 100644
index 000000000000..fe215979d5f3
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050308
@@ -0,0 +1,2 @@
+MD5 43cd1bcd12011b2fec0edce3f047e801 vim-7.0aa-20050308.tar.bz2 5449810
+MD5 1e8ed0edb94933f9a5bcac4886d0ae23 vim-7.0aa-20050308-gentoo-patches.tar.bz2 6671
diff --git a/app-editors/vim-core/files/vimrc-r1 b/app-editors/vim-core/files/vimrc-r1
new file mode 100644
index 000000000000..6cf9d01eadf6
--- /dev/null
+++ b/app-editors/vim-core/files/vimrc-r1
@@ -0,0 +1,163 @@
+scriptencoding utf-8
+" ^^ Please leave the above line at the start of the file.
+
+" Default configuration file for Vim
+" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r1,v 1.1 2005/03/08 21:44:19 ciaranm Exp $
+
+" Written by Aron Griffis <agriffis@gentoo.org>
+" Modified by Ryan Phillips <rphillips@gentoo.org>
+" Modified some more by Ciaran McCreesh <ciaranm@gentoo.org>
+" Added Redhat's vimrc info by Seemant Kulleen <seemant@gentoo.org>
+
+" You can override any of these settings on a global basis via the
+" "/etc/vim/vimrc.local" file, and on a per-user basis via "~/.vimrc". You may
+" need to create these.
+
+" {{{ General settings
+" The following are some sensible defaults for Vim for most users.
+" We attempt to change as little as possible from Vim's defaults,
+" deviating only where it makes sense
+set nocompatible        " Use Vim defaults (much better!)
+set bs=2                " Allow backspacing over everything in insert mode
+set ai                  " Always set auto-indenting on
+set history=50          " keep 50 lines of command history
+set ruler               " Show the cursor position all the time
+
+set viminfo='20,\"500   " Keep a .viminfo file.
+
+" Don't use Ex mode, use Q for formatting
+map Q gq
+
+" When doing tab completion, give the following files lower priority. You may
+" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
+" enhanced tab completion. These can be done in the user vimrc file.
+set suffixes+=.info,.aux,.log,.dvi,.bbl,.out
+
+" When displaying line numbers, don't use an annoyingly wide number column. This
+" doesn't enable line numbers -- :set number will do that. The value given is a
+" minimum width to use for the number column, not a fixed size.
+if v:version >= 700
+  set numberwidth=3
+endif
+" }}}
+
+" {{{ Modeline settings
+" We don't allow modelines by default. See bug #14088 and bug #73715.
+" If you're not concerned about these, you can enable them on a per-user
+" basis by adding "set modeline" to your ~/.vimrc file.
+set nomodeline
+" }}}
+
+" {{{ Locale settings
+" Try to come up with some nice sane GUI fonts. Also try to set a sensible
+" value for fileencodings based upon locale. These can all be overridden in
+" the user vimrc file.
+if v:lang =~? "^ko"
+  set fileencodings=euc-kr
+  set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*
+elseif v:lang =~? "^ja_JP"
+  set fileencodings=euc-jp
+  set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*
+elseif v:lang =~? "^zh_TW"
+  set fileencodings=big5
+  set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0
+elseif v:lang =~? "^zh_CN"
+  set fileencodings=gb2312
+  set guifontset=*-r-*
+endif
+
+" If we have a BOM, always honour that rather than trying to guess.
+if &fileencodings !~? "ucs-bom"
+  set fileencodings^=ucs-bom
+endif
+
+" Always check for UTF-8 when trying to determine encodings.
+if &fileencodings !~? "utf-8"
+  set fileencodings+=utf-8
+endif
+
+" Make sure we have a sane fallback for encoding detection
+set fileencodings+=default
+" }}}
+
+" {{{ Syntax highlighting settings
+" Switch syntax highlighting on, when the terminal has colors
+" Also switch on highlighting the last used search pattern.
+if &t_Co > 2 || has("gui_running")
+  syntax on
+  set hlsearch
+endif
+" }}}
+
+" {{{ Terminal fixes
+if &term ==? "xterm"
+  " Previously we would unset t_RV to prevent gnome-terminal from beeping as
+  " vim started.  These days it appears that gnome-terminal has been repaired,
+  " so re-enable this, and don't restrict t_Co=8.  (21 Jun 2004 agriffis)
+  "set t_RV=			" don't check terminal version
+  "set t_Co=8
+  set t_Sb=^[4%dm
+  set t_Sf=^[3%dm
+  set ttymouse=xterm2	" only works for >=xfree86-3.3.3, should be okay
+endif
+" }}}
+
+" {{{ Filetype plugin settings
+" Enable plugin-provided filetype settings, but only if the ftplugin
+" directory exists (which it won't on livecds, for example).
+if isdirectory(expand("$VIMRUNTIME/ftplugin"))
+  filetype plugin on
+
+  " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
+  " indent settings. Some people don't like these, so we won't turn them on by
+  " default.
+  " filetype indent on
+endif
+" }}}
+
+" {{{ Autocommands
+if has("autocmd")
+
+augroup gentoo
+  au!
+
+  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
+  " required tab settings.  See the following for more information:
+  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
+  " Note that the rules below are very minimal and don't cover everything.
+  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
+  " filetype and indent settings for all things Gentoo.
+  au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
+  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
+
+  " In text files, limit the width of text to 78 characters, but be careful
+  " that we don't override the user's setting.
+  autocmd BufNewFile,BufRead *.txt
+        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
+        \     setlocal textwidth=78 |
+        \ endif
+
+  " When editing a file, always jump to the last cursor position
+  autocmd BufReadPost *
+        \ if ! exists("g:leave_my_cursor_position_alone") |
+        \     if line("'\"") > 0 && line ("'\"") <= line("$") |
+        \         exe "normal g'\"" |
+        \     endif |
+        \ endif
+
+  " When editing a crontab file, set backupcopy to yes rather than auto. See
+  " :help crontab and bug #53437.
+  autocmd FileType crontab set backupcopy=yes
+
+augroup END
+
+endif " has("autocmd")
+" }}}
+
+" {{{ vimrc.local
+if filereadable("/etc/vim/vimrc.local")
+  source /etc/vim/vimrc.local
+endif
+" }}}
+
+" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050122.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050122.ebuild
deleted file mode 100644
index c1a0f4c776a8..000000000000
--- a/app-editors/vim-core/vim-core-7.0_alpha20050122.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050122.ebuild,v 1.1 2005/01/22 20:55:54 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha"
-IUSE="${IUSE} livecd"
-DEPEND="${DEPEND}" # done via the eclass
-PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050201.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050201.ebuild
deleted file mode 100644
index a4582d72497b..000000000000
--- a/app-editors/vim-core/vim-core-7.0_alpha20050201.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050201.ebuild,v 1.1 2005/02/01 19:14:24 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050201"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha"
-IUSE="${IUSE} livecd"
-DEPEND="${DEPEND}" # done via the eclass
-PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050126.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050308.ebuild
index aa8d51cf35a4..1b6a224b9f21 100644
--- a/app-editors/vim-core/vim-core-7.0_alpha20050126.ebuild
+++ b/app-editors/vim-core/vim-core-7.0_alpha20050308.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050126.ebuild,v 1.1 2005/01/26 21:01:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050308.ebuild,v 1.1 2005/03/08 21:44:19 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
 
 VIM_VERSION="7.0aa"
 VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
 VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r1"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${VIM_SNAPSHOT}
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index e9750b37b5ed..2268dcfe830b 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.153 2005/03/06 12:20:45 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.154 2005/03/08 21:45:06 ciaranm Exp $
+
+*vim-7.0_alpha20050308 (08 Mar 2005)
+
+  08 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/vim-completion,
+  -vim-7.0_alpha20050122.ebuild, -vim-7.0_alpha20050126.ebuild,
+  -vim-7.0_alpha20050201.ebuild, +vim-7.0_alpha20050308.ebuild:
+  Updated vim7 snapshot
 
   06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> vim-6.3-r4.ebuild:
   Marked stable on amd64.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 0569bdcb8f55..215123be7f20 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9417f2cc491164ce3c9b9442618faeaa vim-7.0_alpha20050308.ebuild 819
 MD5 3729b354308e2586d4cf1041e18a5983 vim-6.3-r2.ebuild 863
-MD5 9e996deb09bee603e9e185ce950a6c94 vim-7.0_alpha20050126.ebuild 852
+MD5 f2067a617e8babfa6052a0d025dab11f ChangeLog 22105
 MD5 87f5e2f0607d28843acee521eaac4076 vim-7.0_alpha20050201.ebuild 852
 MD5 34b04daf47f4dc791fb5d07fa71fcbc6 vim-6.3-r4.ebuild 896
 MD5 57dbbc8ad0deef3ed5b1209952948853 vim-7.0_alpha20050122.ebuild 852
-MD5 f2067a617e8babfa6052a0d025dab11f ChangeLog 22105
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 0b89dd827cc960494cb2957014735635 files/digest-vim-7.0_alpha20050122 156
+MD5 9e996deb09bee603e9e185ce950a6c94 vim-7.0_alpha20050126.ebuild 852
+MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
 MD5 757e84cb9ddfcb550eb62e3f322fafbb files/digest-vim-7.0_alpha20050126 156
-MD5 bbf20c81c19c38b574fff1e7199915d5 files/digest-vim-7.0_alpha20050201 156
-MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-vim-6.3-r4 274
+MD5 cd8f7c341b95e8d34a705bd2efa9865e files/digest-vim-7.0_alpha20050308 156
 MD5 48e706214652b216c21280e50511627d files/vimrc 3004
-MD5 bbd2459b227910017b5ef6d81c32590f files/vim-completion 985
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCKvW6ntT9W3vfTuoRAiGLAJ48B1WKpgZ/E4iJBsr79MbtFzX4tgCeLgfk
-sAwI6vAyxY5CIgbCAEyyLx0=
-=yFCU
------END PGP SIGNATURE-----
+MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
+MD5 0b89dd827cc960494cb2957014735635 files/digest-vim-7.0_alpha20050122 156
+MD5 bbf20c81c19c38b574fff1e7199915d5 files/digest-vim-7.0_alpha20050201 156
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050122 b/app-editors/vim/files/digest-vim-7.0_alpha20050122
deleted file mode 100644
index ccbe8cc6fe2b..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050122
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ee9920bc069fcf1ca24ea76a61b6fb0f vim-7.0aa-20050122.tar.bz2 5295756
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050126 b/app-editors/vim/files/digest-vim-7.0_alpha20050126
deleted file mode 100644
index cf51cf7938b1..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050126
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4fe31ad17eaf667071db6393b157ccdf vim-7.0aa-20050126.tar.bz2 5321486
-MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050201 b/app-editors/vim/files/digest-vim-7.0_alpha20050201
deleted file mode 100644
index b935821378ea..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050201
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 241b285eac58eb1db01a56a93842fa3f vim-7.0aa-20050201.tar.bz2 5324664
-MD5 6a8bd6cbc0c871259795c12ff30fb111 vim-7.0aa-20050201-gentoo-patches.tar.bz2 6701
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050308 b/app-editors/vim/files/digest-vim-7.0_alpha20050308
new file mode 100644
index 000000000000..fe215979d5f3
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-7.0_alpha20050308
@@ -0,0 +1,2 @@
+MD5 43cd1bcd12011b2fec0edce3f047e801 vim-7.0aa-20050308.tar.bz2 5449810
+MD5 1e8ed0edb94933f9a5bcac4886d0ae23 vim-7.0aa-20050308-gentoo-patches.tar.bz2 6671
diff --git a/app-editors/vim/files/vim-completion b/app-editors/vim/files/vim-completion
index 2df182af6158..157b5464944c 100644
--- a/app-editors/vim/files/vim-completion
+++ b/app-editors/vim/files/vim-completion
@@ -31,6 +31,6 @@ _vim()
     fi
 }
 
-complete -F _vim vim ex view evim rvim rview
+complete -o filenames -F _vim vim ex view evim rvim rview
 
 # vim: set ft=sh sw=4 et sts=4 :
diff --git a/app-editors/vim/vim-7.0_alpha20050122.ebuild b/app-editors/vim/vim-7.0_alpha20050122.ebuild
deleted file mode 100644
index 96d634dc2510..000000000000
--- a/app-editors/vim/vim-7.0_alpha20050122.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050122.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha"
-IUSE="${IUSE}"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}"
-RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050201.ebuild b/app-editors/vim/vim-7.0_alpha20050201.ebuild
deleted file mode 100644
index 347b1594d9e2..000000000000
--- a/app-editors/vim/vim-7.0_alpha20050201.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050201.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050201"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha"
-IUSE="${IUSE}"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}"
-RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050126.ebuild b/app-editors/vim/vim-7.0_alpha20050308.ebuild
index 1140e88b8dec..2780a8bf1298 100644
--- a/app-editors/vim/vim-7.0_alpha20050126.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050308.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050126.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050308.ebuild,v 1.1 2005/03/08 21:45:07 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20050113"
 
 VIM_VERSION="7.0aa"
 VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"