Update to upstream patch 074. Add fixes for bug #92263, bug #93378.

(Portage version: 2.0.51.22-r1 screaming llama edition)

12 files changed, 145 insertions, 18 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 2dc2f1d36637..eb84f47891e9 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.129 2005/05/12 20:28:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.130 2005/05/23 10:19:57 ciaranm Exp $
+
+*gvim-6.3.074 (23 May 2005)
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> +gvim-6.3.074.ebuild:
+  Update to upstream patch 074. Add fixes for bug #92263, bug #93378.
 
   12 May 2005; Markus Rothe <corsair@gentoo.org>
   gvim-7.0_alpha20050326.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index d8a5494cee3f..63763a63714f 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,10 +1,11 @@
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 bed4ef9d963db5ac6d2ce71d33cb670e ChangeLog 18349
 MD5 2bf3627d58fc5bc11e7deaebec4211c5 gvim-6.3-r2.ebuild 1084
 MD5 df87bb0d475e4da7acff21613f12cecd gvim-6.3-r4.ebuild 1082
 MD5 0eebc7315e7ad47929f4bc916584a469 gvim-6.3.068.ebuild 1104
 MD5 1fbbd099d9d5388cc226da7d0155d28d gvim-7.0_alpha20050321.ebuild 1236
 MD5 9806ef65962bbf051537ec678c4e181c gvim-7.0_alpha20050326.ebuild 1243
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 4b37dddfe07861b6a80ea4c7ccb40322 gvim-6.3.074.ebuild 1112
 MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-gvim-6.3-r2 274
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-gvim-6.3-r4 274
 MD5 402d38e428c7b23a62b23f7e96250099 files/digest-gvim-6.3.068 275
@@ -15,3 +16,4 @@ MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
+MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-gvim-6.3.074 275
diff --git a/app-editors/gvim/files/digest-gvim-6.3.074 b/app-editors/gvim/files/digest-gvim-6.3.074
new file mode 100644
index 000000000000..85b6a074439f
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.3.074
@@ -0,0 +1,4 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 7a32bf0af36f14e3397dd4c70ae389dd vim-6.3.074-gentoo-patches.tar.bz2 12773
+MD5 9bcdb0ea7380c5df3e349d8549b5c7cb vim-6.3.074-patches.tar.bz2 95922
diff --git a/app-editors/gvim/gvim-6.3.074.ebuild b/app-editors/gvim/gvim-6.3.074.ebuild
new file mode 100644
index 000000000000..60b823717224
--- /dev/null
+++ b/app-editors/gvim/gvim-6.3.074.ebuild
@@ -0,0 +1,37 @@
+# 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-6.3.074.ebuild,v 1.1 2005/05/23 10:19:57 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_GENTOO_PATCHES="vim-${PV}-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+GVIMRC_FILE_SUFFIX="-r1"
+
+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="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+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/ChangeLog b/app-editors/vim-core/ChangeLog
index ebb1a9ac7f2b..e12b1da36bea 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.147 2005/04/30 09:37:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.148 2005/05/23 10:19:50 ciaranm Exp $
+
+*vim-core-6.3.074 (23 May 2005)
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +vim-core-6.3.074.ebuild:
+  Update to upstream patch 074. Add fixes for bug #92263, bug #93378.
 
   30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   vim-core-6.3.068.ebuild:
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 3c54198186be..3bb14b7c05ae 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,16 +1,18 @@
 MD5 fe185a3f0c2b814808560b7442a603ea ChangeLog 19870
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 5e9dc8a98f0d1234fb8c2324a385c8ab vim-core-6.3-r3.ebuild 901
 MD5 2f4b84c1608030f760332f9e2994d7fe vim-core-6.3-r4.ebuild 947
-MD5 9ebf5e1ac06b024ab8250d9c9d16a6ca vim-core-7.0_alpha20050321.ebuild 840
 MD5 b92a393a9d3de4345361118bc035ef73 vim-core-6.3.068.ebuild 1053
+MD5 9ebf5e1ac06b024ab8250d9c9d16a6ca vim-core-7.0_alpha20050321.ebuild 840
 MD5 080820e394e6c4b569ad2db6b078cf9e vim-core-7.0_alpha20050326.ebuild 840
-MD5 5e9dc8a98f0d1234fb8c2324a385c8ab vim-core-6.3-r3.ebuild 901
+MD5 bddce20e7daa737b8ecdf4f804603d4e vim-core-6.3.074.ebuild 1065
+MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
 MD5 2fa89e2e9fd73c3778073f18e6836be8 files/digest-vim-core-6.3-r4 348
-MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
-MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
-MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
-MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
-MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-core-7.0_alpha20050321 157
 MD5 ee43986336dcd1bd970b36075692c1a1 files/digest-vim-core-6.3.068 418
+MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-core-7.0_alpha20050321 157
 MD5 89adcfac6079754bcf39aaed63e92704 files/digest-vim-core-7.0_alpha20050326 157
-MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
+MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
+MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
+MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
+MD5 19ec579aa1b1e8a0a37abee13838267c files/digest-vim-core-6.3.074 418
diff --git a/app-editors/vim-core/files/digest-vim-core-6.3.074 b/app-editors/vim-core/files/digest-vim-core-6.3.074
new file mode 100644
index 000000000000..b32abf867844
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.3.074
@@ -0,0 +1,6 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 7a32bf0af36f14e3397dd4c70ae389dd vim-6.3.074-gentoo-patches.tar.bz2 12773
+MD5 e31f525ea5d69178839adb38ca259d1a vim-runtime-20050319.tar.bz2 2201601
+MD5 fca3f0009759a91d5442e173f345c10c vim-6.3.068-netrw.tar.bz2 35832
+MD5 9bcdb0ea7380c5df3e349d8549b5c7cb vim-6.3.074-patches.tar.bz2 95922
diff --git a/app-editors/vim-core/vim-core-6.3.074.ebuild b/app-editors/vim-core/vim-core-6.3.074.ebuild
new file mode 100644
index 000000000000..21b1a248bbac
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.3.074.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.3.074.ebuild,v 1.1 2005/05/23 10:19:50 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_RUNTIME_SNAP="vim-runtime-20050319.tar.bz2"
+VIM_NETRW_SNAP="vim-6.3.068-netrw.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r1"
+
+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_RUNTIME_SNAP}
+	mirror://gentoo/${VIM_NETRW_SNAP}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="vim and gvim shared files"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="${IUSE} nls"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
+PDEPEND="!livecd? ( >=app-vim/gentoo-syntax-20050325 )"
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index a1f4adc3fa40..16d6cadb10ee 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.164 2005/04/30 09:38:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.165 2005/05/23 10:19:56 ciaranm Exp $
+
+*vim-6.3.074 (23 May 2005)
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> +vim-6.3.074.ebuild:
+  Update to upstream patch 074. Add fixes for bug #92263, bug #93378.
 
   30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> vim-6.3.068.ebuild:
   Stable on ia64.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index caf94d726231..214d3f150166 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,14 +1,16 @@
 MD5 d6add419cf465b674bdbcd6f616a3fdb ChangeLog 23624
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 3729b354308e2586d4cf1041e18a5983 vim-6.3-r2.ebuild 863
 MD5 eef8f0ac9fc8f9f020572ff1c3c777d7 vim-6.3-r4.ebuild 895
-MD5 5a1185dc7d0014ef98ffc41e9c79d213 vim-7.0_alpha20050321.ebuild 819
 MD5 92bf174c53a95562e06b63ee2e53a5ed vim-6.3.068.ebuild 890
-MD5 3729b354308e2586d4cf1041e18a5983 vim-6.3-r2.ebuild 863
+MD5 5a1185dc7d0014ef98ffc41e9c79d213 vim-7.0_alpha20050321.ebuild 819
 MD5 8df7d0c83d91ace4ed935979dc2e457b vim-7.0_alpha20050326.ebuild 819
+MD5 35020e830775ad454459db3672a3729f vim-6.3.074.ebuild 900
+MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-vim-6.3-r4 274
-MD5 48e706214652b216c21280e50511627d files/vimrc 3004
-MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-7.0_alpha20050321 157
 MD5 402d38e428c7b23a62b23f7e96250099 files/digest-vim-6.3.068 275
-MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
-MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
+MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-7.0_alpha20050321 157
 MD5 89adcfac6079754bcf39aaed63e92704 files/digest-vim-7.0_alpha20050326 157
+MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
+MD5 48e706214652b216c21280e50511627d files/vimrc 3004
+MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
diff --git a/app-editors/vim/files/digest-vim-6.3.074 b/app-editors/vim/files/digest-vim-6.3.074
new file mode 100644
index 000000000000..85b6a074439f
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.3.074
@@ -0,0 +1,4 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 7a32bf0af36f14e3397dd4c70ae389dd vim-6.3.074-gentoo-patches.tar.bz2 12773
+MD5 9bcdb0ea7380c5df3e349d8549b5c7cb vim-6.3.074-patches.tar.bz2 95922
diff --git a/app-editors/vim/vim-6.3.074.ebuild b/app-editors/vim/vim-6.3.074.ebuild
new file mode 100644
index 000000000000..7fbacd6e195a
--- /dev/null
+++ b/app-editors/vim/vim-6.3.074.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.3.074.ebuild,v 1.1 2005/05/23 10:19:56 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="${IUSE} nls"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND}
+	~app-editors/vim-core-${PV}
+	!app-editors/nvi"
+