New version. Drop termcap support, bug #103105. Drop gtk1 support, bug #106560. Make minimal USE flag not need vim-core. Fix vimrc to work with vim built with -eval.

(Portage version: 2.0.52-r1 cut-price flea-ridden swamp edition)

13 files changed, 149 insertions, 35 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index d77085d7ad69..cadfd73271c5 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.148 2005/08/25 15:52:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.149 2005/09/22 19:52:44 ciaranm Exp $
+
+*gvim-6.3.086 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> +gvim-6.3.086.ebuild:
+  New version. Drop termcap support, bug #103105. Drop gtk1 support, bug
+  #106560. Make minimal USE flag not need vim-core. Fix vimrc to work with vim
+  built with -eval.
 
 *gvim-7.0_alpha20050825 (25 Aug 2005)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 585b96a9dac2..a1a99aa076d0 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 28d4de25bfe31d2e8c580a1d8cae382a gvim-6.3.074.ebuild 1104
 MD5 e6ce98c40c00aa0a63113c6af853a5b1 gvim-7.0_alpha20050825.ebuild 1168
 MD5 c0d87d0e84388c628270bde56762735e gvim-6.3.068.ebuild 1096
+MD5 ad849c32cb6e28156ba839beb6914a32 gvim-6.3.086.ebuild 1085
 MD5 9ccac12c4953b31039b92e22b941a7bd gvim-6.3.084.ebuild 1180
 MD5 8e5fedb5e54139b1a1bdcbc5328fbf41 gvim-6.3.075.ebuild 1182
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
@@ -16,12 +14,6 @@ MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 5e57fc9113966cae9d3af1df2aa21606 files/digest-gvim-7.0_alpha20050825 163
 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
 MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-gvim-6.3.075 349
+MD5 ddee1007b0120ebe8fb37d08adcd2ef9 files/digest-gvim-6.3.086 353
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
 MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-gvim-6.3.074 275
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDDemNLLFUmVNQ7rkRAuhNAKCI4W6E1eFFK3jLM+NEOG8/b2XsFwCgoxiR
-HrtppRIV92DbrpLNo51SH28=
-=9gJM
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-6.3.086 b/app-editors/gvim/files/digest-gvim-6.3.086
new file mode 100644
index 000000000000..38581f9a957d
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.3.086
@@ -0,0 +1,5 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 8975fba453dbc1e417afa37ca2ee0d51 vim-6.3.084-r1-gentoo-patches.tar.bz2 14856
+MD5 300a61f1a43ceeab5468a8e3d49d976c vim-6.3.086-patches.tar.bz2 114044
+MD5 d174031e95005c77b465b1b6337da9b8 vim-runtime-20050809.tar.bz2 2204695
diff --git a/app-editors/gvim/gvim-6.3.086.ebuild b/app-editors/gvim/gvim-6.3.086.ebuild
new file mode 100644
index 000000000000..f8a2d55a3be3
--- /dev/null
+++ b/app-editors/gvim/gvim-6.3.086.ebuild
@@ -0,0 +1,33 @@
+# 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.086.ebuild,v 1.1 2005/09/22 19:52:44 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_GENTOO_PATCHES="vim-6.3.084-r1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_RUNTIME_SNAP="vim-runtime-20050809.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}
+	mirror://gentoo/${VIM_RUNTIME_SNAP}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="GUI version of the Vim text editor"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome gtk motif nls"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-${PV}
+	virtual/x11
+	gtk? (
+		>=x11-libs/gtk+-2.6
+		virtual/xft
+		gnome? ( >=gnome-base/libgnomeui-2.6 )
+	)
+	!gtk? ( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 46764b657d52..30d32b8f102f 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,14 @@
 # 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.171 2005/08/25 15:51:17 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.172 2005/09/22 19:51:44 ciaranm Exp $
+
+*vim-core-6.3.086 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/vimrc-r2,
+  +vim-core-6.3.086.ebuild:
+  New version. Drop termcap support, bug #103105. Drop gtk1 support, bug
+  #106560. Make minimal USE flag not need vim-core. Fix vimrc to work with vim
+  built with -eval.
 
 *vim-core-7.0_alpha20050825 (25 Aug 2005)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 54ff09776b9d..4c531a3f7eb6 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 438b5a0d91e4f1dadecd8519aeae6e72 vim-core-6.3.084-r2.ebuild 1063
 MD5 e3bd3fbd47b779a02d6977dc95fda06b vim-core-6.3.075.ebuild 1049
 MD5 08b45bd7dd694cfd7e55e35df99a3019 vim-core-7.0_alpha20050825.ebuild 754
 MD5 fcc1e01f80bdca4b49cd8a54bbafe814 vim-core-6.3.068.ebuild 1046
 MD5 d508e596b3e60137b87bd13e79b547a3 vim-core-6.3.074.ebuild 1059
+MD5 47848af44ea074705e2c5134d74baa2b vim-core-6.3.086.ebuild 1003
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 ba6cf7f0e3d94d0e42bf15179b05aa69 vim-core-6.3.084.ebuild 1047
 MD5 55f50e3c46f1c60b6e1394cde00573da ChangeLog 23872
-MD5 3ae8f74f204374b63052295f80bd6fb9 files/vimrc-r2 6071
+MD5 d3b72e2e4c7eb16d68c9e68d7811642b files/vimrc-r2 6094
 MD5 5d338faaea218fdda249b4725aa31f82 files/digest-vim-core-6.3.084 419
 MD5 19ec579aa1b1e8a0a37abee13838267c files/digest-vim-core-6.3.074 418
 MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 c11f47ad5c2dec1ccb6e2d3806bea9bc files/digest-vim-core-6.3.086 425
 MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
 MD5 9acf0e8856bbca4122ae7bdb9a33eed7 files/digest-vim-core-6.3.084-r2 425
 MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
@@ -20,10 +19,3 @@ MD5 5e57fc9113966cae9d3af1df2aa21606 files/digest-vim-core-7.0_alpha20050825 163
 MD5 49f34fea09c3041dba7daa3a6cb05c85 files/digest-vim-core-6.3.075 418
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 MD5 ee43986336dcd1bd970b36075692c1a1 files/digest-vim-core-6.3.068 418
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDDelNLLFUmVNQ7rkRApLNAKC2Yvqx1IZ7rh8XqZVLfqjgUKqCTACeJon7
-FrkRI+Ftd48240on2kY5gFw=
-=j0bP
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-6.3.086 b/app-editors/vim-core/files/digest-vim-core-6.3.086
new file mode 100644
index 000000000000..ce7a3fcb1a59
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.3.086
@@ -0,0 +1,6 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 8975fba453dbc1e417afa37ca2ee0d51 vim-6.3.084-r1-gentoo-patches.tar.bz2 14856
+MD5 d174031e95005c77b465b1b6337da9b8 vim-runtime-20050809.tar.bz2 2204695
+MD5 746fd4e71906fc9a9cebb2e4437221b3 vim-6.3.084-r2-netrw.tar.bz2 39398
+MD5 300a61f1a43ceeab5468a8e3d49d976c vim-6.3.086-patches.tar.bz2 114044
diff --git a/app-editors/vim-core/files/vimrc-r2 b/app-editors/vim-core/files/vimrc-r2
index 21a1c72627ec..b59564bf94f7 100644
--- a/app-editors/vim-core/files/vimrc-r2
+++ b/app-editors/vim-core/files/vimrc-r2
@@ -2,7 +2,7 @@ scriptencoding utf-8
 " ^^ Please leave the above line at the start of the file.
 
 " Default configuration file for Vim
-" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r2,v 1.1 2005/08/09 16:26:02 ciaranm Exp $
+" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r2,v 1.2 2005/09/22 19:51:44 ciaranm Exp $
 
 " Written by Aron Griffis <agriffis@gentoo.org>
 " Modified by Ryan Phillips <rphillips@gentoo.org>
@@ -127,7 +127,9 @@ endif
 
 " {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
 " files should default to bash. See :help sh-syntax and bug #101819.
-let is_bash=1
+if has("eval")
+  let is_bash=1
+endif
 " }}}
 
 " {{{ Autocommands
diff --git a/app-editors/vim-core/vim-core-6.3.086.ebuild b/app-editors/vim-core/vim-core-6.3.086.ebuild
new file mode 100644
index 000000000000..b9e78eaa544a
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.3.086.ebuild
@@ -0,0 +1,26 @@
+# 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.086.ebuild,v 1.1 2005/09/22 19:51:44 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_RUNTIME_SNAP="vim-runtime-20050809.tar.bz2"
+VIM_NETRW_SNAP="vim-6.3.084-r2-netrw.tar.bz2"
+VIM_GENTOO_PATCHES="vim-6.3.084-r1-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r2"
+
+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="nls"
+PDEPEND="!livecd? ( >=app-vim/gentoo-syntax-20050515 )"
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 8d846ed7c7a7..b5010dca4b13 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.187 2005/09/05 04:18:29 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.188 2005/09/22 19:52:18 ciaranm Exp $
+
+*vim-6.3.086 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> +vim-6.3.086.ebuild:
+  New version. Drop termcap support, bug #103105. Drop gtk1 support, bug
+  #106560. Make minimal USE flag not need vim-core. Fix vimrc to work with vim
+  built with -eval.
 
   05 Sep 2005; Lina Pezzella <j4rg0n@gentoo.org>
   vim-7.0_alpha20050825.ebuild:
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 028c32f715ef..a271d353643a 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,14 +1,16 @@
-MD5 24ca2a9edb3ee323af63c70b950cc9e8 ChangeLog 26975
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 6030d19952620c2d5c7cdd57406ce5f1 vim-6.3.074.ebuild 894
+MD5 6e4b9be8c6da38c599f6635a31097f90 vim-6.3.086.ebuild 1019
 MD5 bee92c86dd7765be7882de88146435d6 vim-7.0_alpha20050825.ebuild 750
+MD5 6030d19952620c2d5c7cdd57406ce5f1 vim-6.3.074.ebuild 894
+MD5 1d804b8fed3350d7b9cc11bf36281406 vim-6.3.068.ebuild 883
 MD5 b18bce40b5b4139759f28ebdcfba8108 vim-6.3.075.ebuild 969
 MD5 37001523b63b30c662dd8f39d9858aa6 vim-6.3.084.ebuild 967
-MD5 1d804b8fed3350d7b9cc11bf36281406 vim-6.3.068.ebuild 883
-MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
-MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-vim-6.3.075 349
-MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
-MD5 48e706214652b216c21280e50511627d files/vimrc 3004
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 24ca2a9edb3ee323af63c70b950cc9e8 ChangeLog 26975
+MD5 402d38e428c7b23a62b23f7e96250099 files/digest-vim-6.3.068 275
 MD5 5e57fc9113966cae9d3af1df2aa21606 files/digest-vim-7.0_alpha20050825 163
+MD5 ddee1007b0120ebe8fb37d08adcd2ef9 files/digest-vim-6.3.086 353
+MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-vim-6.3.084 350
-MD5 402d38e428c7b23a62b23f7e96250099 files/digest-vim-6.3.068 275
+MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-vim-6.3.075 349
+MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
+MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
diff --git a/app-editors/vim/files/digest-vim-6.3.086 b/app-editors/vim/files/digest-vim-6.3.086
new file mode 100644
index 000000000000..38581f9a957d
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.3.086
@@ -0,0 +1,5 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 8975fba453dbc1e417afa37ca2ee0d51 vim-6.3.084-r1-gentoo-patches.tar.bz2 14856
+MD5 300a61f1a43ceeab5468a8e3d49d976c vim-6.3.086-patches.tar.bz2 114044
+MD5 d174031e95005c77b465b1b6337da9b8 vim-runtime-20050809.tar.bz2 2204695
diff --git a/app-editors/vim/vim-6.3.086.ebuild b/app-editors/vim/vim-6.3.086.ebuild
new file mode 100644
index 000000000000..81081bdbf925
--- /dev/null
+++ b/app-editors/vim/vim-6.3.086.ebuild
@@ -0,0 +1,29 @@
+# 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.086.ebuild,v 1.1 2005/09/22 19:52:18 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-6.3.084-r1-gentoo-patches.tar.bz2"
+VIM_RUNTIME_SNAP="vim-runtime-20050809.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}
+	mirror://gentoo/${VIM_RUNTIME_SNAP}"
+
+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="nls minimal"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	!minimal? ( ~app-editors/vim-core-${PV} )"
+RDEPEND="${RDEPEND}
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	!app-editors/nvi"
+