New version. More fstab fixes, bug #108732.

(Portage version: 2.0.53_rc5 three monkeys, ten minutes edition)

12 files changed, 121 insertions, 33 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 2c4b9e8e9570..33c5e13c436b 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.153 2005/10/09 18:42:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.154 2005/10/15 20:19:34 ciaranm Exp $
+
+*gvim-6.4 (15 Oct 2005)
+
+  15 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> +gvim-6.4.ebuild:
+  New version. More fstab fixes, bug #108732.
 
   09 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> -gvim-6.3.068.ebuild,
   -gvim-6.3.074.ebuild, -gvim-6.3.075.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 4c2b22650e1a..24356aed8fe8 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d8fb0cc17f1cb4bf925435541df78b8e ChangeLog 22121
 MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-gvim-6.3.084 350
 MD5 ddee1007b0120ebe8fb37d08adcd2ef9 files/digest-gvim-6.3.086 353
+MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-gvim-6.4 200
 MD5 1b1ea0702477782dc90a718f4c7a6716 files/digest-gvim-6.4_beta 207
 MD5 a65308105a0c09c0ec5cc1aea1b62264 files/digest-gvim-7.0_alpha20050928 163
 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
@@ -13,13 +11,7 @@ MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
 MD5 9ccac12c4953b31039b92e22b941a7bd gvim-6.3.084.ebuild 1180
 MD5 6b89a10d0902b0f7df89c0b986c0f85d gvim-6.3.086.ebuild 1085
+MD5 81440191461d98887ecdb2d5c702256c gvim-6.4.ebuild 1088
 MD5 7c45dc31e80f5c6d42bb60c73fa6d0c6 gvim-6.4_beta.ebuild 1107
 MD5 212c09d2e6f6e11719f0a4c7c28b7afd gvim-7.0_alpha20050928.ebuild 1066
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDSWS7LLFUmVNQ7rkRAtnFAJ4mTG+tNI/NswPya6ln/Pxb+mOdVQCfaP0s
-2TLsczZBvtav6uJmEr9hbj0=
-=AK/N
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-6.4 b/app-editors/gvim/files/digest-gvim-6.4
new file mode 100644
index 000000000000..360a03fb005b
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.4
@@ -0,0 +1,3 @@
+MD5 6b3293132a01e4b0cead244eefbe577f vim-6.4-gentoo-patches.tar.bz2 10940
+MD5 3cca6128fe5439e89d3828b5e708bddb vim-6.4-lang.tar.gz 1118790
+MD5 774c14d93ce58674b3b2c880edd12d77 vim-6.4.tar.bz2 3737338
diff --git a/app-editors/gvim/gvim-6.4.ebuild b/app-editors/gvim/gvim-6.4.ebuild
new file mode 100644
index 000000000000..adf64b2228f5
--- /dev/null
+++ b/app-editors/gvim/gvim-6.4.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.4.ebuild,v 1.1 2005/10/15 20:19:34 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.4"
+VIM_GENTOO_PATCHES="vim-${PV}-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 f99013513eb5..0fadd60f5b8a 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,11 @@
 # 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.176 2005/10/09 18:41:39 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.177 2005/10/15 20:19:07 ciaranm Exp $
+
+*vim-core-6.4 (15 Oct 2005)
+
+  15 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> +vim-core-6.4.ebuild:
+  New version. More fstab fixes, bug #108732.
 
   09 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org>
   -vim-core-6.3.068.ebuild, -vim-core-6.3.074.ebuild,
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 95890ec9ba22..0f0ca1e76d5d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c7b2ce145f1c1ad46d843948666bd63b ChangeLog 24869
 MD5 5d338faaea218fdda249b4725aa31f82 files/digest-vim-core-6.3.084 419
 MD5 9acf0e8856bbca4122ae7bdb9a33eed7 files/digest-vim-core-6.3.084-r2 425
 MD5 c11f47ad5c2dec1ccb6e2d3806bea9bc files/digest-vim-core-6.3.086 425
+MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-vim-core-6.4 200
 MD5 1b1ea0702477782dc90a718f4c7a6716 files/digest-vim-core-6.4_beta 207
 MD5 a65308105a0c09c0ec5cc1aea1b62264 files/digest-vim-core-7.0_alpha20050928 163
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
@@ -16,12 +14,6 @@ MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 438b5a0d91e4f1dadecd8519aeae6e72 vim-core-6.3.084-r2.ebuild 1063
 MD5 ba6cf7f0e3d94d0e42bf15179b05aa69 vim-core-6.3.084.ebuild 1047
 MD5 fa82ea17eb64a131fc7a0381fb671f39 vim-core-6.3.086.ebuild 1000
+MD5 3b5b76954fc2ce901458a28948007bb5 vim-core-6.4.ebuild 1007
 MD5 d70efba6ac269045039e0dfa1e665d2f vim-core-6.4_beta.ebuild 1026
 MD5 09593a87742d9a79cf4450d41d4596af vim-core-7.0_alpha20050928.ebuild 766
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDSWR9LLFUmVNQ7rkRAqrZAJ9jJz+W1sVrX9ZmjR5QLxxfQqbPpQCgvtf6
-zKAQGqanwuEqbTSZ39yx+BM=
-=XS1Z
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-6.4 b/app-editors/vim-core/files/digest-vim-core-6.4
new file mode 100644
index 000000000000..360a03fb005b
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.4
@@ -0,0 +1,3 @@
+MD5 6b3293132a01e4b0cead244eefbe577f vim-6.4-gentoo-patches.tar.bz2 10940
+MD5 3cca6128fe5439e89d3828b5e708bddb vim-6.4-lang.tar.gz 1118790
+MD5 774c14d93ce58674b3b2c880edd12d77 vim-6.4.tar.bz2 3737338
diff --git a/app-editors/vim-core/vim-core-6.4.ebuild b/app-editors/vim-core/vim-core-6.4.ebuild
new file mode 100644
index 000000000000..da043602f815
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.4.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.4.ebuild,v 1.1 2005/10/15 20:19:07 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.4"
+# 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-${PV}-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 9aea6edc8364..58b9aa1aae25 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.192 2005/10/09 18:42:09 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.193 2005/10/15 20:20:06 ciaranm Exp $
+
+*vim-6.4 (15 Oct 2005)
+
+  15 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> +vim-6.4.ebuild:
+  New version. More fstab fixes, bug #108732.
 
   09 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> -vim-6.3.068.ebuild,
   -vim-6.3.074.ebuild, -vim-6.3.075.ebuild:
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 34ca4b02826a..f71b8269247f 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6e4a7ff60060a6de44f688badb0c1d63 ChangeLog 27886
 MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-vim-6.3.084 350
 MD5 ddee1007b0120ebe8fb37d08adcd2ef9 files/digest-vim-6.3.086 353
+MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-vim-6.4 200
 MD5 1b1ea0702477782dc90a718f4c7a6716 files/digest-vim-6.4_beta 207
 MD5 a65308105a0c09c0ec5cc1aea1b62264 files/digest-vim-7.0_alpha20050928 163
 MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
@@ -11,12 +9,6 @@ MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 37001523b63b30c662dd8f39d9858aa6 vim-6.3.084.ebuild 967
 MD5 44a0710ec5ead2278a9e6cd748973955 vim-6.3.086.ebuild 1019
+MD5 692cba93ed69bab787a6706fccd58da0 vim-6.4.ebuild 1022
 MD5 f0d27a05ce5fae54e66ac17ab60a0006 vim-6.4_beta.ebuild 1041
 MD5 fe1fa3734c4d673d2d3f400db9cb47a5 vim-7.0_alpha20050928.ebuild 820
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDSWSbLLFUmVNQ7rkRAvcCAJ40iSDcpy9HdoLGjh+7SoKW9VKTRACfRss/
-3sF4eVJgDyzABriZXvhdY8A=
-=PFL8
------END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/digest-vim-6.4 b/app-editors/vim/files/digest-vim-6.4
new file mode 100644
index 000000000000..360a03fb005b
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.4
@@ -0,0 +1,3 @@
+MD5 6b3293132a01e4b0cead244eefbe577f vim-6.4-gentoo-patches.tar.bz2 10940
+MD5 3cca6128fe5439e89d3828b5e708bddb vim-6.4-lang.tar.gz 1118790
+MD5 774c14d93ce58674b3b2c880edd12d77 vim-6.4.tar.bz2 3737338
diff --git a/app-editors/vim/vim-6.4.ebuild b/app-editors/vim/vim-6.4.ebuild
new file mode 100644
index 000000000000..eab6f3ec3459
--- /dev/null
+++ b/app-editors/vim/vim-6.4.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.4.ebuild,v 1.1 2005/10/15 20:20:06 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.4"
+# VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-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"
+