New vim7 snapshot. Tidy up old snapshots for eclass changes.

(Portage version: 2.0.51.22-r2 flaming goat edition)

21 files changed, 59 insertions, 170 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 5a96dc0dceac..fb5b5e79e3b8 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.143 2005/07/23 22:04:14 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.144 2005/08/09 22:59:53 ciaranm Exp $
+
+*gvim-7.0_alpha20050809 (09 Aug 2005)
+
+  09 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -gvim-7.0_alpha20050622.ebuild, -gvim-7.0_alpha20050721.ebuild,
+  +gvim-7.0_alpha20050809.ebuild:
+  New vim7 snapshot. Tidy up old snapshots for eclass changes.
 
   23 Jul 2005; Hardave Riar <hardave@gentoo.org> gvim-6.3.084.ebuild:
   Stable on mips, bug #99578.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index d3b6c860e0e8..b815067e0b77 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,19 +1,17 @@
-MD5 7caf373c06217ed713175f83469b34af ChangeLog 20309
-MD5 9ccac12c4953b31039b92e22b941a7bd gvim-6.3.084.ebuild 1180
-MD5 c0d87d0e84388c628270bde56762735e gvim-6.3.068.ebuild 1096
 MD5 28d4de25bfe31d2e8c580a1d8cae382a gvim-6.3.074.ebuild 1104
+MD5 c0d87d0e84388c628270bde56762735e gvim-6.3.068.ebuild 1096
+MD5 c0cbca23c820a842a3bb7adec554cd80 gvim-7.0_alpha20050809.ebuild 1164
+MD5 9ccac12c4953b31039b92e22b941a7bd gvim-6.3.084.ebuild 1180
 MD5 8e5fedb5e54139b1a1bdcbc5328fbf41 gvim-6.3.075.ebuild 1182
-MD5 e869cd7539bf19266cf6da2e4c8599a4 gvim-7.0_alpha20050721.ebuild 1242
-MD5 ecbd6a75a31f9672214f11165e374f49 gvim-7.0_alpha20050622.ebuild 1241
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 7caf373c06217ed713175f83469b34af ChangeLog 20309
 MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-gvim-6.3.084 350
+MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
+MD5 550f61064b75c4bf7821525428e89617 files/digest-gvim-7.0_alpha20050809 163
 MD5 402d38e428c7b23a62b23f7e96250099 files/digest-gvim-6.3.068 275
-MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-gvim-6.3.074 275
-MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-gvim-6.3.075 349
-MD5 09ddb27b09622238519d236eee139298 files/digest-gvim-7.0_alpha20050721 156
-MD5 99a85c2440380af0bbf6b80277429940 files/digest-gvim-7.0_alpha20050622 157
-MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
-MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
+MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
+MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
+MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-gvim-6.3.075 349
 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-7.0_alpha20050622 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050622
deleted file mode 100644
index d18eda8be4b1..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050622
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7c09260aef81c7595806111b5e158b47 vim-7.0aa-20050622.tar.bz2 6461884
-MD5 a16597b39b35c6db9cc2128a1f23a670 vim-7.0aa-20050622-gentoo-patches.tar.bz2 12831
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050721 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050721
deleted file mode 100644
index e562884cf13d..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050721
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c09c24395d099d9b882cc1b2ea3dc502 vim-7.0aa-20050721.tar.bz2 6570585
-MD5 f335e3f52ed7d62c381fadf2af1d8a5f vim-7.0aa-20050721-gentoo-patches.tar.bz2 9451
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050809 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050809
new file mode 100644
index 000000000000..8cc740a41012
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-7.0_alpha20050809
@@ -0,0 +1,2 @@
+MD5 4afee533d2327a6d9e00cfa4d1ef5c44 vim-7.0_alpha20050809.tar.bz2 6293235
+MD5 3ace25d34f19b32b1fd60986ecdc2887 vim-7.0_alpha20050809-gentoo-patches.tar.bz2 11954
diff --git a/app-editors/gvim/gvim-7.0_alpha20050721.ebuild b/app-editors/gvim/gvim-7.0_alpha20050721.ebuild
deleted file mode 100644
index e50953360646..000000000000
--- a/app-editors/gvim/gvim-7.0_alpha20050721.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-7.0_alpha20050721.ebuild,v 1.1 2005/07/21 19:02:24 rphillips Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~alpha ~ppc64"
-IUSE="aqua gnome gtk gtk2 motif nextaw qt"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	virtual/x11
-	!aqua? (
-		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.4
-				virtual/xft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk2? (
-				gnome? ( gnome-base/gnome-libs )
-				!gnome? ( =x11-libs/gtk+-1.2* )
-			)
-		)
-		!gtk? (
-			qt? (
-				>=kde-base/kdelibs-3.3.1
-			)
-			!qt? (
-				motif? (
-					x11-libs/openmotif
-				)
-				!motif? (
-					nextaw? (
-						x11-libs/neXtaw
-					)
-				)
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.0_alpha20050622.ebuild b/app-editors/gvim/gvim-7.0_alpha20050809.ebuild
index f13f9f013d7c..0c939eae1c9f 100644
--- a/app-editors/gvim/gvim-7.0_alpha20050622.ebuild
+++ b/app-editors/gvim/gvim-7.0_alpha20050809.ebuild
@@ -1,14 +1,14 @@
 # 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-7.0_alpha20050622.ebuild,v 1.2 2005/07/07 02:01:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050809.ebuild,v 1.1 2005/08/09 22:59:53 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
 
 VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
+VIM_SNAPSHOT="vim-${PV}.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-gentoo-patches.tar.bz2"
 GVIMRC_FILE_SUFFIX="-r1"
 
 SRC_URI="${SRC_URI}
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 3c0a009ae4bd..6bf8199d190f 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.165 2005/08/09 16:26:02 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.166 2005/08/09 22:58:32 ciaranm Exp $
+
+*vim-core-7.0_alpha20050809 (09 Aug 2005)
+
+  09 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -vim-core-7.0_alpha20050622.ebuild, -vim-core-7.0_alpha20050721.ebuild,
+  +vim-core-7.0_alpha20050809.ebuild:
+  New vim7 snapshot. Tidy up old snapshots for eclass changes.
 
 *vim-core-6.3.084-r1 (09 Aug 2005)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index edf81a45f7ee..2082c56275aa 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,11 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3dc6ecd27c606a420beb6f7a8f3c76b6 vim-core-7.0_alpha20050622.ebuild 827
+MD5 00fdeb689a8aa6f32f3b710d2c37585a vim-core-7.0_alpha20050809.ebuild 750
 MD5 e3bd3fbd47b779a02d6977dc95fda06b vim-core-6.3.075.ebuild 1049
 MD5 14433af0f971d653624f9d78105abb32 vim-core-6.3.084-r1.ebuild 1061
 MD5 fcc1e01f80bdca4b49cd8a54bbafe814 vim-core-6.3.068.ebuild 1046
-MD5 88911c9921b102652a3232483dcfc0bb vim-core-7.0_alpha20050721.ebuild 828
 MD5 d508e596b3e60137b87bd13e79b547a3 vim-core-6.3.074.ebuild 1059
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 ba6cf7f0e3d94d0e42bf15179b05aa69 vim-core-6.3.084.ebuild 1047
@@ -15,17 +11,9 @@ MD5 5d338faaea218fdda249b4725aa31f82 files/digest-vim-core-6.3.084 419
 MD5 19ec579aa1b1e8a0a37abee13838267c files/digest-vim-core-6.3.074 418
 MD5 7c733202ff77d34df50039b42d153521 files/digest-vim-core-6.3.084-r1 425
 MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 550f61064b75c4bf7821525428e89617 files/digest-vim-core-7.0_alpha20050809 163
 MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
 MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
-MD5 09ddb27b09622238519d236eee139298 files/digest-vim-core-7.0_alpha20050721 156
 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
-MD5 99a85c2440380af0bbf6b80277429940 files/digest-vim-core-7.0_alpha20050622 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC+NkiLLFUmVNQ7rkRAuUCAKCUGTBsonVrFRxxZhqEcRAS7ulbTwCgoPpo
-1+nNQfzCyS27FMVX14/r0qc=
-=QuyA
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050622 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050622
deleted file mode 100644
index d18eda8be4b1..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050622
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7c09260aef81c7595806111b5e158b47 vim-7.0aa-20050622.tar.bz2 6461884
-MD5 a16597b39b35c6db9cc2128a1f23a670 vim-7.0aa-20050622-gentoo-patches.tar.bz2 12831
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050721 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050721
deleted file mode 100644
index e562884cf13d..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050721
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c09c24395d099d9b882cc1b2ea3dc502 vim-7.0aa-20050721.tar.bz2 6570585
-MD5 f335e3f52ed7d62c381fadf2af1d8a5f vim-7.0aa-20050721-gentoo-patches.tar.bz2 9451
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050809 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050809
new file mode 100644
index 000000000000..8cc740a41012
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050809
@@ -0,0 +1,2 @@
+MD5 4afee533d2327a6d9e00cfa4d1ef5c44 vim-7.0_alpha20050809.tar.bz2 6293235
+MD5 3ace25d34f19b32b1fd60986ecdc2887 vim-7.0_alpha20050809-gentoo-patches.tar.bz2 11954
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050721.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050721.ebuild
deleted file mode 100644
index 970f727cff21..000000000000
--- a/app-editors/vim-core/vim-core-7.0_alpha20050721.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-7.0_alpha20050721.ebuild,v 1.1 2005/07/21 19:01:00 rphillips Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-VIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha ~ppc-macos"
-IUSE=""
-DEPEND="${DEPEND}" # done via the eclass
-PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050622.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050809.ebuild
index 2822d4a4d38e..0e56ddf9eb04 100644
--- a/app-editors/vim-core/vim-core-7.0_alpha20050622.ebuild
+++ b/app-editors/vim-core/vim-core-7.0_alpha20050809.ebuild
@@ -1,15 +1,15 @@
 # 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-7.0_alpha20050622.ebuild,v 1.2 2005/07/07 02:32:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050809.ebuild,v 1.1 2005/08/09 22:58:32 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
 
 VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-VIMRC_FILE_SUFFIX="-r1"
+VIM_SNAPSHOT="vim-${PV}.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r2"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${VIM_SNAPSHOT}
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 560d5bf0913d..5bd8f484dd38 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.181 2005/07/23 22:02:42 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.182 2005/08/09 22:59:10 ciaranm Exp $
+
+*vim-7.0_alpha20050809 (09 Aug 2005)
+
+  09 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -vim-7.0_alpha20050622.ebuild, -vim-7.0_alpha20050721.ebuild,
+  +vim-7.0_alpha20050809.ebuild:
+  New vim7 snapshot. Tidy up old snapshots for eclass changes.
 
   23 Jul 2005; Hardave Riar <hardave@gentoo.org> vim-6.3.084.ebuild:
   Stable on mips, bug #99578.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 5b7a263913ff..00d7450e2d02 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 85a5fc2df54130639750cef01a59d80b vim-7.0_alpha20050622.ebuild 813
-MD5 37001523b63b30c662dd8f39d9858aa6 vim-6.3.084.ebuild 967
+MD5 08bc6d535cf2282c486968ed833978e5 vim-7.0_alpha20050809.ebuild 736
 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 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 18066c9b10960c6892ae685c2cae9055 vim-7.0_alpha20050721.ebuild 814
 MD5 8ddbc0597244c6e11f4ec964753ae162 ChangeLog 25973
-MD5 1d804b8fed3350d7b9cc11bf36281406 vim-6.3.068.ebuild 883
-MD5 09ddb27b09622238519d236eee139298 files/digest-vim-7.0_alpha20050721 156
-MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-vim-6.3.084 350
-MD5 99a85c2440380af0bbf6b80277429940 files/digest-vim-7.0_alpha20050622 157
-MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
 MD5 402d38e428c7b23a62b23f7e96250099 files/digest-vim-6.3.068 275
+MD5 48e706214652b216c21280e50511627d files/vimrc 3004
+MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-vim-6.3.084 350
+MD5 550f61064b75c4bf7821525428e89617 files/digest-vim-7.0_alpha20050809 163
 MD5 94d109de61a8e47f057a1a07ecbc491e files/digest-vim-6.3.075 349
+MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
 MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
-MD5 48e706214652b216c21280e50511627d files/vimrc 3004
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC41qZgIKl8Uu19MoRAs8nAJ0WYkC8OGKwYMELLBiN/CsVnsVLqgCfVMr6
-W4GS+tLf4XK4vzG8fypAfp8=
-=jVbu
------END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050622 b/app-editors/vim/files/digest-vim-7.0_alpha20050622
deleted file mode 100644
index d18eda8be4b1..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050622
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7c09260aef81c7595806111b5e158b47 vim-7.0aa-20050622.tar.bz2 6461884
-MD5 a16597b39b35c6db9cc2128a1f23a670 vim-7.0aa-20050622-gentoo-patches.tar.bz2 12831
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050721 b/app-editors/vim/files/digest-vim-7.0_alpha20050721
deleted file mode 100644
index e562884cf13d..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050721
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c09c24395d099d9b882cc1b2ea3dc502 vim-7.0aa-20050721.tar.bz2 6570585
-MD5 f335e3f52ed7d62c381fadf2af1d8a5f vim-7.0aa-20050721-gentoo-patches.tar.bz2 9451
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050809 b/app-editors/vim/files/digest-vim-7.0_alpha20050809
new file mode 100644
index 000000000000..8cc740a41012
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-7.0_alpha20050809
@@ -0,0 +1,2 @@
+MD5 4afee533d2327a6d9e00cfa4d1ef5c44 vim-7.0_alpha20050809.tar.bz2 6293235
+MD5 3ace25d34f19b32b1fd60986ecdc2887 vim-7.0_alpha20050809-gentoo-patches.tar.bz2 11954
diff --git a/app-editors/vim/vim-7.0_alpha20050721.ebuild b/app-editors/vim/vim-7.0_alpha20050721.ebuild
deleted file mode 100644
index ba2f62dd73a3..000000000000
--- a/app-editors/vim/vim-7.0_alpha20050721.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-7.0_alpha20050721.ebuild,v 1.1 2005/07/21 19:01:44 rphillips Exp $
-
-inherit vim
-
-VIM_DATESTAMP="${PV##*alpha}"
-
-VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64 ~ppc64 ~alpha"
-IUSE=""
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}"
-RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050622.ebuild b/app-editors/vim/vim-7.0_alpha20050809.ebuild
index 2b3240cc4746..ff6cd3ddf4e2 100644
--- a/app-editors/vim/vim-7.0_alpha20050622.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050809.ebuild
@@ -1,14 +1,14 @@
 # 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-7.0_alpha20050622.ebuild,v 1.2 2005/07/07 02:18:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050809.ebuild,v 1.1 2005/08/09 22:59:10 ciaranm Exp $
 
 inherit vim
 
 VIM_DATESTAMP="${PV##*alpha}"
 
 VIM_VERSION="7.0aa"
-VIM_SNAPSHOT="vim-${VIM_VERSION}-${VIM_DATESTAMP}.tar.bz2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-${VIM_PATCHES_DATESTAMP:-${VIM_DATESTAMP}}-gentoo-patches.tar.bz2"
+VIM_SNAPSHOT="vim-${PV}.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PV}-gentoo-patches.tar.bz2"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${VIM_SNAPSHOT}