Update to 6.3.045 from vim.org, bug #73715

9 files changed, 90 insertions, 27 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index b5c854b80db1..4bae3d697916 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2004/11/28 14:39:44 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.95 2004/12/09 19:22:38 ciaranm Exp $
+
+*gvim-6.3-r2 (09 Dec 2004)
+
+  09 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> +gvim-6.3-r2.ebuild:
+  Update to 6.3.045 from vim.org, bug #73715
 
 *gvim-7.0_alpha20041128 (28 Nov 2004)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 70994c7708ca..8cffb7eed97b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b0ca5684e96f545a2cda121d78e16f22 gvim-7.0_alpha20041128.ebuild 1009
 MD5 ef4fe105556ba463fd933cf10d71b3e9 gvim-6.3.ebuild 1036
 MD5 3f69fc7ae72de127145fc351a595feb3 ChangeLog 13824
 MD5 b21036246a6b841c40ef399de77bd68a gvim-6.3-r1.ebuild 1081
 MD5 382c48b44602a94ca91a7e8aee275ae8 gvim-6.2-r9.ebuild 1007
+MD5 612ac3423b719b1a48dd687494fe297d gvim-6.3-r2.ebuild 1089
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
 MD5 e8e36a6ec1a6d972aafb9226bc62cdff files/digest-gvim-6.2-r9 275
 MD5 fb2a47a60e211fc9d75868f1f2b3103e files/digest-gvim-7.0_alpha20041128 156
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
 MD5 92a2522224cd5b27c8db26216ce16842 files/gvim.desktop 171
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBqeMrLLFUmVNQ7rkRAnLVAKCYZ04Dd0qwB6cT2J6bIVuVDFqVNgCgogwD
-gVBVKh2OTzg6cTF4EJN+goY=
-=v9S8
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-6.3-r2 b/app-editors/gvim/files/digest-gvim-6.3-r2
new file mode 100644
index 000000000000..a37018b4db05
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.3-r2
@@ -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 b04900244202ea8d108178b0639d9c58 vim-6.3.045-patches.tar.bz2 63214
diff --git a/app-editors/gvim/gvim-6.3-r2.ebuild b/app-editors/gvim/gvim-6.3-r2.ebuild
new file mode 100644
index 000000000000..baf5315d8955
--- /dev/null
+++ b/app-editors/gvim/gvim-6.3-r2.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-r2.ebuild,v 1.1 2004/12/09 19:22:38 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.045-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 ~ppc64"
+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 ) )"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 9f27a42c3368..f7bfab4c36d6 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8c7fb8ad9e38f46e1a01c431bbb84eb ChangeLog 14651
+MD5 ed6ad4670a571b718fe223f6cde3e90c ChangeLog 14842
 MD5 5fd2352b70db145d1466c8908ab5c1ed vim-core-6.3-r2.ebuild 900
 MD5 60a51ae6b34ec44b49ceb95e90d1880d vim-core-6.3-r1.ebuild 933
+MD5 499954e45b02c8f3d488244c0a77223c vim-core-6.3-r3.ebuild 911
 MD5 3330011ebccdcc03224f5ebb1c7701fb vim-core-6.2-r9.ebuild 904
 MD5 fd90ca0b2689c29b666792cb078ac6b7 vim-core-7.0_alpha20041128.ebuild 775
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 6d745fb259963da4b34e1012fbba6820 vim-core-6.3.ebuild 933
 MD5 fb2a47a60e211fc9d75868f1f2b3103e files/digest-vim-core-7.0_alpha20041128 156
-MD5 87f3c8acc718fd31a69fba58b14695af files/vimrc 3943
+MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
+MD5 dd881e7dd31d444d83fe00f6a8e9d992 files/vimrc 3654
 MD5 1c089e2955a0cc3a474e86a6ecfb0177 files/digest-vim-core-6.3-r2 348
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 MD5 f7046d975c3b2dd7a6e82e4287e6d3ab files/digest-vim-core-6.3 277
@@ -18,7 +20,7 @@ MD5 c8a344d069577df7e39c1f6592827642 files/digest-vim-core-6.3-r1 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBthupLLFUmVNQ7rkRAnxvAJsEbMeD7qasq3jXnUcE2hgS+Cb5KACeIJJb
-8VnZNjr2BUxppIL6UJeb294=
-=IGdz
+iD8DBQFBuKbyLLFUmVNQ7rkRAlbxAKC8q9tbp5/nOdpsklLHKflPud7H+gCfawBm
+o9thKWmiVhbsX+Fpo/r4SRo=
+=QQ6w
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 3e87a738575e..fc27c81aaa1d 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.127 2004/11/28 14:38:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.128 2004/12/09 19:18:47 ciaranm Exp $
+
+*vim-6.3-r2 (09 Dec 2004)
+
+  09 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> +vim-6.3-r2.ebuild:
+  Update to 6.3.045 from vim.org, bug #73715
 
 *vim-7.0_alpha20041128 (28 Nov 2004)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index d7626733f7ba..4e89ebbf1526 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1bdb02d7b29c736ff10023533506b086 vim-6.3.ebuild 831
 MD5 d6cf596b0862440c341e54799fd31690 vim-6.3-r1.ebuild 824
+MD5 c6c418ab42894910d6365527aa539d6b vim-6.3-r2.ebuild 834
 MD5 1b4b09e69598ca63165110c957a8c1dd ChangeLog 18926
 MD5 70ff5f08eadd85a141fc40239163a997 vim-6.2-r9.ebuild 803
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
@@ -11,11 +9,5 @@ MD5 fb2a47a60e211fc9d75868f1f2b3103e files/digest-vim-7.0_alpha20041128 156
 MD5 23d1cd2df664b4adbe0ba4334a58d46d files/digest-vim-6.3-r1 274
 MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 cf04f5e783d474814c5923309b511165 files/digest-vim-6.3 203
+MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
 MD5 e8e36a6ec1a6d972aafb9226bc62cdff files/digest-vim-6.2-r9 275
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBqeL6LLFUmVNQ7rkRAlIQAJ9mYloen8a0IEP18YOOgsWyWHLgFgCeIlbC
-PPnX3T4tN7NtF71tAA9bhR0=
-=DZ5E
------END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/digest-vim-6.3-r2 b/app-editors/vim/files/digest-vim-6.3-r2
new file mode 100644
index 000000000000..a37018b4db05
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.3-r2
@@ -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 b04900244202ea8d108178b0639d9c58 vim-6.3.045-patches.tar.bz2 63214
diff --git a/app-editors/vim/vim-6.3-r2.ebuild b/app-editors/vim/vim-6.3-r2.ebuild
new file mode 100644
index 000000000000..287721aecc90
--- /dev/null
+++ b/app-editors/vim/vim-6.3-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.3-r2.ebuild,v 1.1 2004/12/09 19:18:48 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-6.3.045-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-6.3.025-gentoo-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="Vim, an improved vi-style text editor"
+KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~alpha ~ia64 ~arm ~hppa ~ppc64 ~s390"
+IUSE="${IUSE} nls"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}"