Update vim7 snapshot. Included an improved .desktop file, thanks to Joe McCann and Sebastian Dröge in bug #68622

(Portage version: 2.0.51-r12)

6 files changed, 49 insertions, 25 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index fff98fdcd868..f8d926899f31 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2005/01/10 15:05:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.106 2005/01/13 22:22:52 ciaranm Exp $
+
+*gvim-7.0_alpha20050113 (13 Jan 2005)
+
+  13 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/gvim.desktop,
+  -gvim-7.0_alpha20041211.ebuild, +gvim-7.0_alpha20050113.ebuild:
+  Update vim7 snapshot. Included an improved .desktop file, thanks to Joe
+  McCann and Sebastian Dröge in bug #68622
 
   10 Jan 2005; Aron Griffis <agriffis@gentoo.org>
   gvim-7.0_alpha20041211.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 4f17abf0af20..7380a733473b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,15 +1,15 @@
+MD5 8a04c3c954f4d9700269684ec3ed2fa9 gvim-6.3.ebuild 1038
 MD5 389cc51f708c70728c31b06474c9b335 ChangeLog 14936
-MD5 5d9472eb17e43ba367279fb94f12ebe8 gvim-6.2-r9.ebuild 1009
 MD5 24cdf428dda1388f8b1c633b01a24a18 gvim-6.3-r1.ebuild 1084
-MD5 8a04c3c954f4d9700269684ec3ed2fa9 gvim-6.3.ebuild 1038
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 874d0650a38eafdd22d9fd5682a8245d gvim-7.0_alpha20041211.ebuild 1073
+MD5 9a804e31a8dca366d4b9c7f6e872dd99 gvim-7.0_alpha20050113.ebuild 1247
+MD5 5d9472eb17e43ba367279fb94f12ebe8 gvim-6.2-r9.ebuild 1009
 MD5 2bf3627d58fc5bc11e7deaebec4211c5 gvim-6.3-r2.ebuild 1084
-MD5 e8e36a6ec1a6d972aafb9226bc62cdff files/digest-gvim-6.2-r9 275
-MD5 cf04f5e783d474814c5923309b511165 files/digest-gvim-6.3 203
-MD5 23d1cd2df664b4adbe0ba4334a58d46d files/digest-gvim-6.3-r1 274
-MD5 92a2522224cd5b27c8db26216ce16842 files/gvim.desktop 171
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
+MD5 e8e36a6ec1a6d972aafb9226bc62cdff files/digest-gvim-6.2-r9 275
+MD5 0559e12807c0742ed95a93dc0d9dc7fb files/digest-gvim-7.0_alpha20050113 156
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
-MD5 323bb0675999afcc25910f0350b35f26 files/digest-gvim-7.0_alpha20041211 156
+MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-gvim-6.3-r2 274
+MD5 cf04f5e783d474814c5923309b511165 files/digest-gvim-6.3 203
+MD5 23d1cd2df664b4adbe0ba4334a58d46d files/digest-gvim-6.3-r1 274
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20041211 b/app-editors/gvim/files/digest-gvim-7.0_alpha20041211
deleted file mode 100644
index 20387d89bb46..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20041211
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b0151e8a48efebd6e4882aca4a0e0218 vim-7.0aa-20041211.tar.bz2 5237125
-MD5 7b9b2c412444bc720f5eba650b7fe8d5 vim-7.0aa-20041128-gentoo-patches.tar.bz2 5194
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050113 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050113
new file mode 100644
index 000000000000..ba2e8660b66d
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-7.0_alpha20050113
@@ -0,0 +1,2 @@
+MD5 072b3414d6224bfaf2469177fcb15565 vim-7.0aa-20050113.tar.bz2 5278098
+MD5 b912a6076b177e46a14fe0f9f4046dfb vim-7.0aa-20050113-gentoo-patches.tar.bz2 6153
diff --git a/app-editors/gvim/files/gvim.desktop b/app-editors/gvim/files/gvim.desktop
index d575ab7e46fa..58421b27477a 100644
--- a/app-editors/gvim/files/gvim.desktop
+++ b/app-editors/gvim/files/gvim.desktop
@@ -6,4 +6,5 @@ Exec=gvim
 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/gvim-7.0_alpha20041211.ebuild b/app-editors/gvim/gvim-7.0_alpha20050113.ebuild
index 16b28080ec8a..e7c940003d32 100644
--- a/app-editors/gvim/gvim-7.0_alpha20041211.ebuild
+++ b/app-editors/gvim/gvim-7.0_alpha20050113.ebuild
@@ -1,11 +1,11 @@
 # 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_alpha20041211.ebuild,v 1.3 2005/01/10 15:05:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050113.ebuild,v 1.1 2005/01/13 22:22:52 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
-VIM_PATCHES_DATESTAMP="20041128"
+VIM_PATCHES_DATESTAMP="20050113"
 
 VIM_VERSION="7.0aa"
 VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
@@ -18,20 +18,36 @@ SRC_URI="${SRC_URI}
 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"
+IUSE="${IUSE} gnome gtk gtk2 motif nextaw qt"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? (
-		gtk2? (
-			>=x11-libs/gtk+-2.4
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
+	!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* )
+			)
 		)
-		!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
+					)
+				)
+			)
 		)
-	)
-	!gtk? ( motif? ( x11-libs/openmotif ) )"
+	)"