new vim7 goodness

Package-Manager: portage-2.0.51.19 small furry bundle of death edition

11 files changed, 55 insertions, 135 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}