Version bump. Drop old. Added new gvim.desktop file for bug 190289, thanks to Chidambar Zinnoury.

(Portage version: 2.1.3.9)

15 files changed, 31 insertions, 287 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index f1a7602f67a4..07995ec5963e 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.249 2007/08/23 06:38:15 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.250 2007/09/27 09:39:57 hawking Exp $
+
+*gvim-7.1.123 (27 Sep 2007)
+
+  27 Sep 2007; Ali Polatel <hawking@gentoo.org> +files/gvim.desktop-r1,
+  -files/gvimrc, -gvim-7.0.174.ebuild, -gvim-7.1.ebuild,
+  -gvim-7.1-r1.ebuild, -gvim-7.1.002.ebuild, -gvim-7.1.028.ebuild,
+  -gvim-7.1.087.ebuild, +gvim-7.1.123.ebuild:
+  Version bump. Drop old. Added new gvim.desktop file for bug 190289, thanks
+  to Chidambar Zinnoury.
+
+*gvim-7.1.116 (18 Sep 2007)
+
+  18 Sep 2007; Ali Polatel <hawking@gentoo.org> +files/gvim.desktop-r1,
+  +gvim-7.1.116.ebuild:
+  version bump. use gvim -f %F in gvim.desktop (bug 190289)
 
 *gvim-7.1.087 (23 Aug 2007)
 
diff --git a/app-editors/gvim/files/digest-gvim-7.0.174 b/app-editors/gvim/files/digest-gvim-7.0.174
deleted file mode 100644
index ef1411917a27..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0.174
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a55e36b3c7a21a5835a35574d1f6595e vim-7.0-gentoo-patches-r1.tar.bz2 6749
-RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 vim-7.0-gentoo-patches-r1.tar.bz2 6749
-SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c vim-7.0-gentoo-patches-r1.tar.bz2 6749
-MD5 e8c8bb2b5c03f49d40e9736b7d479b9b vim-7.0-r1.tar.bz2 6117202
-RMD160 d24982a1b802dad9955940365665163a4641fd74 vim-7.0-r1.tar.bz2 6117202
-SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e vim-7.0-r1.tar.bz2 6117202
-MD5 6b3b1681c7502a20ca05d5602b85bc24 vim-patches-7.0.174.tar.gz 257873
-RMD160 0bccdff774a7fdbe3c72cdbe3896ed7c6154e9aa vim-patches-7.0.174.tar.gz 257873
-SHA256 79aa9eb52f23d91e66034cc6897d7d31a1596d130a3902a4e21824193a53ca51 vim-patches-7.0.174.tar.gz 257873
diff --git a/app-editors/gvim/files/digest-gvim-7.1 b/app-editors/gvim/files/digest-gvim-7.1
deleted file mode 100644
index 3b57449dffd9..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 78439f5a5ffa19dbc7fc7cdfff7ed7e2 vim-7.1-gentoo-patches.tar.bz2 6170
-RMD160 18401e255876c5bac2ee6c604e42a87406b38502 vim-7.1-gentoo-patches.tar.bz2 6170
-SHA256 80b78ecded23b39d8a6e4832906904c035abc3c589c69397997fa1183f941fe8 vim-7.1-gentoo-patches.tar.bz2 6170
-MD5 44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2 6876053
-RMD160 470775e0d0219cafe7e04dd91199ed7441882456 vim-7.1.tar.bz2 6876053
-SHA256 7f0a5195db1981806090a46aa962f980edc68eba72ca5cfc8287aff612f1cf70 vim-7.1.tar.bz2 6876053
diff --git a/app-editors/gvim/files/digest-gvim-7.1-r1 b/app-editors/gvim/files/digest-gvim-7.1-r1
deleted file mode 100644
index d43ca7f738ba..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7a8e328ec3c925484d691dd2a4195f97 vim-7.1-gentoo-patches-r1.tar.bz2 6456
-RMD160 62a1d79fd5725c31bd2afa9762d10a36c730494c vim-7.1-gentoo-patches-r1.tar.bz2 6456
-SHA256 56f856055b9b9515f2922909e00924460d4d5b636c20a2d1feae8ca59eb3f063 vim-7.1-gentoo-patches-r1.tar.bz2 6456
-MD5 44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2 6876053
-RMD160 470775e0d0219cafe7e04dd91199ed7441882456 vim-7.1.tar.bz2 6876053
-SHA256 7f0a5195db1981806090a46aa962f980edc68eba72ca5cfc8287aff612f1cf70 vim-7.1.tar.bz2 6876053
diff --git a/app-editors/gvim/files/digest-gvim-7.1.002 b/app-editors/gvim/files/digest-gvim-7.1.002
deleted file mode 100644
index 6affd36cfc80..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.1.002
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 605cc7ae31bcc9d7864bb0bb6025f55d vim-7.1-extra.tar.gz 713842
-RMD160 e44bde407fb42233a8fbcc74d96a03650bf863d1 vim-7.1-extra.tar.gz 713842
-SHA256 4f4a4809e0089fe7c3b8dc1ae96cc692ca4dd62f06bd1c542c83ef2a345fdf1b vim-7.1-extra.tar.gz 713842
-MD5 78439f5a5ffa19dbc7fc7cdfff7ed7e2 vim-7.1-gentoo-patches.tar.bz2 6170
-RMD160 18401e255876c5bac2ee6c604e42a87406b38502 vim-7.1-gentoo-patches.tar.bz2 6170
-SHA256 80b78ecded23b39d8a6e4832906904c035abc3c589c69397997fa1183f941fe8 vim-7.1-gentoo-patches.tar.bz2 6170
-MD5 144aa049ba70621acf4247f0459f3ee7 vim-7.1-lang.tar.gz 1188738
-RMD160 ac38dde9b2e497687f9d046786b3ce1e45f45020 vim-7.1-lang.tar.gz 1188738
-SHA256 ffbd99baac105994163efe78a1b0a3c77faae38f66d7df00465c7dd7f8879947 vim-7.1-lang.tar.gz 1188738
-MD5 44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2 6876053
-RMD160 470775e0d0219cafe7e04dd91199ed7441882456 vim-7.1.tar.bz2 6876053
-SHA256 7f0a5195db1981806090a46aa962f980edc68eba72ca5cfc8287aff612f1cf70 vim-7.1.tar.bz2 6876053
-MD5 6b98932c2a15737a9ee32dd98dc022f0 vim-patches-7.1.002.tar.gz 1984
-RMD160 d0bc8cbae8adfff68e22cda454e63e2041fa5b4a vim-patches-7.1.002.tar.gz 1984
-SHA256 f506119446024aa099b62e13784b711f49178d6dbe664c423e47ae9c388169b8 vim-patches-7.1.002.tar.gz 1984
diff --git a/app-editors/gvim/files/digest-gvim-7.1.087 b/app-editors/gvim/files/digest-gvim-7.1.087
deleted file mode 100644
index ec38e5a72d69..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.1.087
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 605cc7ae31bcc9d7864bb0bb6025f55d vim-7.1-extra.tar.gz 713842
-RMD160 e44bde407fb42233a8fbcc74d96a03650bf863d1 vim-7.1-extra.tar.gz 713842
-SHA256 4f4a4809e0089fe7c3b8dc1ae96cc692ca4dd62f06bd1c542c83ef2a345fdf1b vim-7.1-extra.tar.gz 713842
-MD5 78439f5a5ffa19dbc7fc7cdfff7ed7e2 vim-7.1-gentoo-patches.tar.bz2 6170
-RMD160 18401e255876c5bac2ee6c604e42a87406b38502 vim-7.1-gentoo-patches.tar.bz2 6170
-SHA256 80b78ecded23b39d8a6e4832906904c035abc3c589c69397997fa1183f941fe8 vim-7.1-gentoo-patches.tar.bz2 6170
-MD5 144aa049ba70621acf4247f0459f3ee7 vim-7.1-lang.tar.gz 1188738
-RMD160 ac38dde9b2e497687f9d046786b3ce1e45f45020 vim-7.1-lang.tar.gz 1188738
-SHA256 ffbd99baac105994163efe78a1b0a3c77faae38f66d7df00465c7dd7f8879947 vim-7.1-lang.tar.gz 1188738
-MD5 44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2 6876053
-RMD160 470775e0d0219cafe7e04dd91199ed7441882456 vim-7.1.tar.bz2 6876053
-SHA256 7f0a5195db1981806090a46aa962f980edc68eba72ca5cfc8287aff612f1cf70 vim-7.1.tar.bz2 6876053
-MD5 30c57229d4efd23a1765457dc3b7ab81 vim-patches-7.1.087.tar.gz 122057
-RMD160 ba5f971e65f968ce9b2cebfe35d176df4c4c705a vim-patches-7.1.087.tar.gz 122057
-SHA256 e34a6953f882889cd0b490b1e93f1d6f3cc95baa4f56bc94389e06d364e285fa vim-patches-7.1.087.tar.gz 122057
diff --git a/app-editors/gvim/files/digest-gvim-7.1.028 b/app-editors/gvim/files/digest-gvim-7.1.123
index 869c3944066e..e98f6148d7a1 100644
--- a/app-editors/gvim/files/digest-gvim-7.1.028
+++ b/app-editors/gvim/files/digest-gvim-7.1.123
@@ -10,6 +10,6 @@ SHA256 ffbd99baac105994163efe78a1b0a3c77faae38f66d7df00465c7dd7f8879947 vim-7.1-
 MD5 44c6b4914f38d6f9aa959640b89da329 vim-7.1.tar.bz2 6876053
 RMD160 470775e0d0219cafe7e04dd91199ed7441882456 vim-7.1.tar.bz2 6876053
 SHA256 7f0a5195db1981806090a46aa962f980edc68eba72ca5cfc8287aff612f1cf70 vim-7.1.tar.bz2 6876053
-MD5 38664f76dc672ccc95f864bf14c75a7a vim-patches-7.1.028.tar.gz 32377
-RMD160 98ea9e39c53deec96f9660aa830df43a1c04f079 vim-patches-7.1.028.tar.gz 32377
-SHA256 84ed4814afa92890f5940498349706f630e55c56b9e6b288abe9e7d1e03ce54d vim-patches-7.1.028.tar.gz 32377
+MD5 8df0947382bfc5d539504b1734852e0c vim-patches-7.1.123.tar.gz 180251
+RMD160 a710946be2a0b5784254ccc35533956e17a04d07 vim-patches-7.1.123.tar.gz 180251
+SHA256 994311b5f1ca0739958f0087ec6a99bd779266ebb74dde3fc6d3ad6c8befd2f7 vim-patches-7.1.123.tar.gz 180251
diff --git a/app-editors/gvim/files/gvim.desktop-r1 b/app-editors/gvim/files/gvim.desktop-r1
new file mode 100644
index 000000000000..737c9090086a
--- /dev/null
+++ b/app-editors/gvim/files/gvim.desktop-r1
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=gVim
+Comment=A highly configurable text editor
+Exec=gvim -f %F
+Icon=gvim
+Terminal=false
+Type=Application
+MimeType=text/css;text/html;text/htmlh;text/plain;text/rss;text/sgml;text/x-adasrc;text/x-authors;text/x-c++hdr;text/x-c++src;text/x-copying;text/x-credits;text/x-csharp;text/x-csrc;text/x-dtd;text/x-fortran;text/x-gettext-translation-template;text/x-gettext-translation;text/x-gtkrc;text/x-haskell;text/x-idl;text/x-install;text/x-java;text/x-js;text/x-ksh;text/x-ksysv-log;text/x-literate-haskell;text/x-log;text/x-makefile;text/x-moc;text/x-msil;text/x-nemerle;text/x-objcsrc;text/x-pascal;text/x-patch;text/x-readme;text/x-scheme;text/x-setext;text/x-sql;text/x-tcl;text/x-tex;text/x-texinfo;text/x-troff-me;text/x-troff-mm;text/x-troff-ms;text/x-uil;text/x-vb;text/xml;
+Categories=Application;Development;
diff --git a/app-editors/gvim/files/gvimrc b/app-editors/gvim/files/gvimrc
deleted file mode 100644
index 90c502a88b7b..000000000000
--- a/app-editors/gvim/files/gvimrc
+++ /dev/null
@@ -1,20 +0,0 @@
-" Default configuration file for gvim
-" 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>*
diff --git a/app-editors/gvim/gvim-7.0.174.ebuild b/app-editors/gvim/gvim-7.0.174.ebuild
deleted file mode 100644
index ae90cdb82ce9..000000000000
--- a/app-editors/gvim/gvim-7.0.174.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.174.ebuild,v 1.11 2007/07/22 08:39:36 omp Exp $
-
-inherit vim
-
-VIM_VERSION="7.0"
-VIM_SNAPSHOT="vim-7.0-r1.tar.bz2"
-VIM_GENTOO_PATCHES="vim-7.0-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.1-r1.ebuild b/app-editors/gvim/gvim-7.1-r1.ebuild
deleted file mode 100644
index 90496faa2be6..000000000000
--- a/app-editors/gvim/gvim-7.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1-r1.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
-
-inherit vim
-
-VIM_VERSION="7.1"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches-r1.tar.bz2"
-#VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-	#mirror://gentoo/${VIM_ORG_PATCHES}
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.1.002.ebuild b/app-editors/gvim/gvim-7.1.002.ebuild
deleted file mode 100644
index b5761d6ff819..000000000000
--- a/app-editors/gvim/gvim-7.1.002.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.002.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
-
-inherit vim
-
-VIM_VERSION="7.1"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-extra.tar.gz
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.1.028.ebuild b/app-editors/gvim/gvim-7.1.028.ebuild
deleted file mode 100644
index 1db0bddfa166..000000000000
--- a/app-editors/gvim/gvim-7.1.028.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.028.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
-
-inherit vim
-
-VIM_VERSION="7.1"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-extra.tar.gz
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.1.087.ebuild b/app-editors/gvim/gvim-7.1.123.ebuild
index 2dd407b4a8ab..47f95a057aa6 100644
--- a/app-editors/gvim/gvim-7.1.087.ebuild
+++ b/app-editors/gvim/gvim-7.1.123.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.087.ebuild,v 1.1 2007/08/23 06:38:15 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.123.ebuild,v 1.1 2007/09/27 09:39:57 hawking Exp $
 
 inherit vim
 
@@ -8,6 +8,7 @@ VIM_VERSION="7.1"
 VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
 VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
 GVIMRC_FILE_SUFFIX="-r1"
+GVIM_DESKTOP_SUFFIX="-r1"
 
 SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
 	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
diff --git a/app-editors/gvim/gvim-7.1.ebuild b/app-editors/gvim/gvim-7.1.ebuild
deleted file mode 100644
index bb6ab87f1b6b..000000000000
--- a/app-editors/gvim/gvim-7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
-
-inherit vim
-
-VIM_VERSION="7.1"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-#VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-	#mirror://gentoo/${VIM_ORG_PATCHES}
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"