New release. Fixes bug #79981, bug #81289, bug #83383, bug #83416, bug #83565, bug #85758, upstream patches up to 6.3.068.

Package-Manager: portage-2.0.51.19 small furry bundle of death edition

12 files changed, 135 insertions, 35 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 0a4e75a8b780..a9aac62c1012 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.118 2005/03/22 15:33:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.119 2005/03/25 03:28:35 ciaranm Exp $
+
+*gvim-6.3.068 (25 Mar 2005)
+
+  25 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +gvim-6.3.068.ebuild:
+  New release. Fixes bug #79981, bug #81289, bug #83383, bug #83416, bug
+  #83565, bug #85758, upstream patches up to 6.3.068.
 
   22 Mar 2005; Aron Griffis <agriffis@gentoo.org> gvim-6.3-r4.ebuild:
   Stable on alpha
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 32d1001af4f5..45aae7c7b8e0 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,12 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2278f735499803b3f130ceb0969f8056 gvim-6.3-r4.ebuild 1083
 MD5 69fed52921e6124de3fb8d42415c2f50 ChangeLog 17083
+MD5 45ddd22ef565f9ca8c8d3f97a6bfadf2 gvim-6.3.068.ebuild 1111
 MD5 1fbbd099d9d5388cc226da7d0155d28d gvim-7.0_alpha20050321.ebuild 1236
 MD5 2bf3627d58fc5bc11e7deaebec4211c5 gvim-6.3-r2.ebuild 1084
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
+MD5 402d38e428c7b23a62b23f7e96250099 files/digest-gvim-6.3.068 275
 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
@@ -14,10 +13,3 @@ MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-gvim-6.3-r2 274
 MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-gvim-7.0_alpha20050321 157
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-gvim-6.3-r4 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQEzpLLFUmVNQ7rkRAsf9AJ9FbM8SQIbwJ+OSp3w9Mnk1ueYnEgCeJdL8
-xMJD11IK0K9IwP66RyYv944=
-=3Qq7
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-6.3.068 b/app-editors/gvim/files/digest-gvim-6.3.068
new file mode 100644
index 000000000000..3cb067b147dc
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.3.068
@@ -0,0 +1,4 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 682ea2e6a7c1705ad4007adfa4116c6e vim-6.3.068-gentoo-patches.tar.bz2 11512
+MD5 a51ddc36742bef3a72d643c0f0c2c286 vim-6.3.068-patches.tar.bz2 91406
diff --git a/app-editors/gvim/gvim-6.3.068.ebuild b/app-editors/gvim/gvim-6.3.068.ebuild
new file mode 100644
index 000000000000..888903db496e
--- /dev/null
+++ b/app-editors/gvim/gvim-6.3.068.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.068.ebuild,v 1.1 2005/03/25 03:28:35 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 67c4c9cf66cc..34bb6ee22b35 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.139 2005/03/22 15:31:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.140 2005/03/25 03:28:03 ciaranm Exp $
+
+*vim-core-6.3.068 (25 Mar 2005)
+
+  25 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +vim-core-6.3.068.ebuild:
+  New release. Fixes bug #79981, bug #81289, bug #83383, bug #83416, bug
+  #83565, bug #85758, upstream patches up to 6.3.068.
 
   22 Mar 2005; Aron Griffis <agriffis@gentoo.org> vim-core-6.3-r4.ebuild:
   Stable on alpha
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index b9c64a486445..93fcd6b00bd9 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 efc67e9b6cac79d5d0fc448bca1272e4 ChangeLog 18822
 MD5 9ebf5e1ac06b024ab8250d9c9d16a6ca vim-core-7.0_alpha20050321.ebuild 840
+MD5 43608082c7c21133bbd14b33f6db8f29 vim-core-6.3.068.ebuild 1064
 MD5 5e9dc8a98f0d1234fb8c2324a385c8ab vim-core-6.3-r3.ebuild 901
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 2f4b84c1608030f760332f9e2994d7fe vim-core-6.3-r4.ebuild 947
 MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-core-7.0_alpha20050321 157
 MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
+MD5 ee43986336dcd1bd970b36075692c1a1 files/digest-vim-core-6.3.068 418
 MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
 MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
 MD5 2fa89e2e9fd73c3778073f18e6836be8 files/digest-vim-core-6.3-r4 348
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQEzhLLFUmVNQ7rkRAjQ1AJ9eUMKKUkW4vWl2jm4OUdvlb+VM7gCeKhYL
-4xFIyJMDQrvEa6zBf6bri/8=
-=ivOt
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-6.3.068 b/app-editors/vim-core/files/digest-vim-core-6.3.068
new file mode 100644
index 000000000000..a68552b6d086
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.3.068
@@ -0,0 +1,6 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 682ea2e6a7c1705ad4007adfa4116c6e vim-6.3.068-gentoo-patches.tar.bz2 11512
+MD5 e31f525ea5d69178839adb38ca259d1a vim-runtime-20050319.tar.bz2 2201601
+MD5 fca3f0009759a91d5442e173f345c10c vim-6.3.068-netrw.tar.bz2 35832
+MD5 a51ddc36742bef3a72d643c0f0c2c286 vim-6.3.068-patches.tar.bz2 91406
diff --git a/app-editors/vim-core/vim-core-6.3.068.ebuild b/app-editors/vim-core/vim-core-6.3.068.ebuild
new file mode 100644
index 000000000000..6affe5e96c39
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.3.068.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.068.ebuild,v 1.1 2005/03/25 03:28:03 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-${PV}-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 f349591140e3..87d47983c28f 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.156 2005/03/22 15:32:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.157 2005/03/25 03:29:07 ciaranm Exp $
+
+*vim-6.3.068 (25 Mar 2005)
+
+  25 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +vim-6.3.068.ebuild:
+  New release. Fixes bug #79981, bug #81289, bug #83383, bug #83416, bug
+  #83565, bug #85758, upstream patches up to 6.3.068.
 
   22 Mar 2005; Aron Griffis <agriffis@gentoo.org> vim-6.3-r4.ebuild:
   Stable on alpha
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e34fff531660..32198edf1d16 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 eef8f0ac9fc8f9f020572ff1c3c777d7 vim-6.3-r4.ebuild 895
 MD5 3729b354308e2586d4cf1041e18a5983 vim-6.3-r2.ebuild 863
 MD5 f895130bd33ec80d278fba851e92d2bf ChangeLog 22636
+MD5 eef8f0ac9fc8f9f020572ff1c3c777d7 vim-6.3-r4.ebuild 895
+MD5 1908b3ed07261e0ba5361f7c1a23bd0f vim-6.3.068.ebuild 901
 MD5 5a1185dc7d0014ef98ffc41e9c79d213 vim-7.0_alpha20050321.ebuild 819
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
-MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 fd40cb6bcf70915df71cdfc65cd0ac7c files/digest-vim-7.0_alpha20050321 157
 MD5 b9203f742a2fb575ca24d486e177a9dc files/digest-vim-6.3-r4 274
+MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 461a5fdc06cac13bb9c7d9c869d68e2e files/digest-vim-6.3-r2 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCQDqhBXaUFmZvwyMRArMBAJ4y/uy8eFVQ43q2Ypo3EQRtjXOcfgCfV/NX
-MPpVnLqI0NPTBQsB1TYpexE=
-=adSw
------END PGP SIGNATURE-----
+MD5 402d38e428c7b23a62b23f7e96250099 files/digest-vim-6.3.068 275
diff --git a/app-editors/vim/files/digest-vim-6.3.068 b/app-editors/vim/files/digest-vim-6.3.068
new file mode 100644
index 000000000000..3cb067b147dc
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.3.068
@@ -0,0 +1,4 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 682ea2e6a7c1705ad4007adfa4116c6e vim-6.3.068-gentoo-patches.tar.bz2 11512
+MD5 a51ddc36742bef3a72d643c0f0c2c286 vim-6.3.068-patches.tar.bz2 91406
diff --git a/app-editors/vim/vim-6.3.068.ebuild b/app-editors/vim/vim-6.3.068.ebuild
new file mode 100644
index 000000000000..139cd1fbb219
--- /dev/null
+++ b/app-editors/vim/vim-6.3.068.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.068.ebuild,v 1.1 2005/03/25 03:29:07 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"
+