Update to 6.3.025. Add in GNOME 2 GUI support when USE="gtk gtk2 gnome" (bug #61879). Provide a gvim.desktop file (bug #44633).

6 files changed, 109 insertions, 3 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 43f83f5ab2c2..403a098b072b 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.85 2004/06/24 21:55:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.86 2004/09/10 23:28:26 ciaranm Exp $
+
+*gvim-6.3-r1 (11 Sep 2004)
+
+  11 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> +files/gvim.desktop,
+  +files/gvim.xpm, +gvim-6.3-r1.ebuild:
+  Update to 6.3.025. Add in GNOME 2 GUI support when USE="gtk gtk2 gnome" (bug
+  #61879). Provide a gvim.desktop file (bug #44633).
 
   22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> gvim-6.3.ebuild:
   Stable on hppa
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 4b2c49149687..a75491ec6f41 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,7 +1,11 @@
-MD5 ef4fe105556ba463fd933cf10d71b3e9 gvim-6.3.ebuild 1036
 MD5 70a5ad2a6741f364210bef433ee37b6f gvim-6.2-r9.ebuild 1008
 MD5 865bfc417fdeec9403055bc7d91f429c ChangeLog 12512
+MD5 ef4fe105556ba463fd933cf10d71b3e9 gvim-6.3.ebuild 1036
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 cf04f5e783d474814c5923309b511165 files/digest-gvim-6.3 203
+MD5 1a9c4dd6bab10183ef4be8dd76b4c391 gvim-6.3-r1.ebuild 1081
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
+MD5 cf04f5e783d474814c5923309b511165 files/digest-gvim-6.3 203
 MD5 e8e36a6ec1a6d972aafb9226bc62cdff files/digest-gvim-6.2-r9 275
+MD5 92a2522224cd5b27c8db26216ce16842 files/gvim.desktop 171
+MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
+MD5 23d1cd2df664b4adbe0ba4334a58d46d files/digest-gvim-6.3-r1 274
diff --git a/app-editors/gvim/files/digest-gvim-6.3-r1 b/app-editors/gvim/files/digest-gvim-6.3-r1
new file mode 100644
index 000000000000..ec1c79998013
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.3-r1
@@ -0,0 +1,4 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 39de45308558b65d2ffb3f78feb93fa5 vim-6.3.025-gentoo-patches.tar.bz2 5183
+MD5 a3285c2b9707c50994d2a2fead6ef3c4 vim-6.3.025-patches.tar.bz2 30273
diff --git a/app-editors/gvim/files/gvim.desktop b/app-editors/gvim/files/gvim.desktop
new file mode 100644
index 000000000000..d575ab7e46fa
--- /dev/null
+++ b/app-editors/gvim/files/gvim.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=gVim
+Comment=A highly configurable text editor
+Exec=gvim
+Icon=gvim
+Terminal=false
+Type=Application
+Categories=Application;Development;
diff --git a/app-editors/gvim/files/gvim.xpm b/app-editors/gvim/files/gvim.xpm
new file mode 100644
index 000000000000..694720ac309d
--- /dev/null
+++ b/app-editors/gvim/files/gvim.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 8 1",
+"  c Gray0",
+". c #000080",
+"X c #008000",
+"o c Green",
+"O c #808080",
+"+ c #c0c0c0",
+"@ c Gray100",
+"# c None",
+/* pixels */
+"###############  ###############",
+"############## oo ##############",
+"###           oXXo #         ###",
+"## @@@@@@@@@@@ XXXo @@@@@@@@@ ##",
+"## @+++++++++++ XXX @+++++++++ #",
+"### ++++++++++O XXXX ++++++++O #",
+"#### O++++++OO XXXXXX O+++++OO #",
+"#### @++++++O XXXXXX @+++++OO ##",
+"#### @++++++O XXXXX @@++++OO ###",
+"#### @++++++O XXXX @@++++OO ####",
+"#### @++++++O XXX @@++++OO #####",
+"#### @++++++O XX @@++++OO . ####",
+"###  @++++++O X @@++++OO XX. ###",
+"## o @++++++O  @@++++OO XXXX. ##",
+"# oX @++++++O @@++++OO XXXXXX. #",
+" oXX @++++++O@@++++OO XXXXXXXX. ",
+" oXX @++++++O@++++OO XXXXXXXXX. ",
+"# oX @++++++O++++OO XXXXXXXXX. #",
+"## o @++++++++++   XXXXXXXXX. ##",
+"###  @+++++++++ ++ XXXXXXXX. ###",
+"#### @+++++++++ ++ XXXXXXX. ####",
+"#### @++++++++O   X   X      ###",
+"#### @+++++++O +++ +++ +++ ++ ##",
+"#### @++++++OO  ++  ++++++++++ #",
+"#### @+++++OO  ++   ++..++  + ##",
+"#### @++++OO X ++  ++. ++  ++ ##",
+"#### @+++OO XX ++  ++  ++  ++ ##",
+"#### @++OO  X ++  ++  ++  ++ ###",
+"##### +OO ##  +++ ++  ++  +++ ##",
+"######   ####    .  ##  ##   ###",
+"############## .. ##############",
+"###############  ###############"
+};
diff --git a/app-editors/gvim/gvim-6.3-r1.ebuild b/app-editors/gvim/gvim-6.3-r1.ebuild
new file mode 100644
index 000000000000..7f1dbb0e8f08
--- /dev/null
+++ b/app-editors/gvim/gvim-6.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.3-r1.ebuild,v 1.1 2004/09/10 23:28:26 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_GENTOO_PATCHES="vim-6.3.025-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.3.025-patches.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.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="~x86 ~sparc ~mips ~ppc ~alpha ~amd64 ~ia64 ~hppa"
+IUSE="${IUSE} gnome gtk gtk2 motif nls"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}
+	virtual/x11
+	gtk? (
+		gtk2? (
+			>=x11-libs/gtk+-2.2
+			virtual/xft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( motif? ( x11-libs/openmotif ) )"