Update vim7 snapshot. Included an improved .desktop file, thanks to Joe McCann and...

Package-Manager: portage-2.0.51-r12

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index fff98fdcd8680207e06686b53435b1ac46db52ae..f8d926899f315e5ee26386831f25ba31b6394749 100644 (file)
--- 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/files/digest-gvim-7.0_alpha20041211 b/app-editors/gvim/files/digest-gvim-7.0_alpha20041211
deleted file mode 100644 (file)
index 20387d8..0000000
--- 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 (file)
index 0000000..ba2e866
--- /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 d575ab7e46fa5ae3946375703e84d989eada98eb..58421b27477a0ac80c215968aa53f5df33742383 100644 (file)
--- 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
similarity index 57%
rename from app-editors/gvim/gvim-7.0_alpha20041211.ebuild
rename to app-editors/gvim/gvim-7.0_alpha20050113.ebuild
index 16b28080ec8ac3e47619b6222f4490fd9532f2e4..e7c940003d32bb91e01456383d5917ce6bd608f1 100644 (file)
--- 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 ) )"
+       )"