New vim7 snapshot.

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

15 files changed, 43 insertions, 58 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index cadfd73271c5..e913dc046836 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.149 2005/09/22 19:52:44 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.150 2005/09/22 20:45:26 ciaranm Exp $
+
+*gvim-7.0_alpha20050922 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -gvim-7.0_alpha20050825.ebuild, +gvim-7.0_alpha20050922.ebuild:
+  New vim7 snapshot.
 
 *gvim-6.3.086 (22 Sep 2005)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 47e574d105d3..9568ef3c3da0 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,29 +1,19 @@
------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 6b89a10d0902b0f7df89c0b986c0f85d 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
+MD5 b9282f7e87934b86d6cefafa857c3741 gvim-7.0_alpha20050922.ebuild 1054
 MD5 616fbeaeebe0031f637a996c062795f7 ChangeLog 21474
 MD5 d4fb34453773bf6b99743f752860a6f5 files/digest-gvim-6.3.084 350
 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
 MD5 402d38e428c7b23a62b23f7e96250099 files/digest-gvim-6.3.068 275
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
 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 516fcbe7fcdff28cd13524a3fc8b95eb files/digest-gvim-7.0_alpha20050922 163
 MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-gvim-6.3.074 275
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDMwvJLLFUmVNQ7rkRAse4AJ9XkHzuEM/nCgiaghk9I53GYO25AwCfRbO6
-hbL2nGeV3+NpDFbZTdPLhB0=
-=7vEo
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050825 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050825
deleted file mode 100644
index 10ca75ef455d..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0_alpha20050825
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be93013cb325b791d9dee017062c5f1a vim-7.0_alpha20050825.tar.bz2 6334863
-MD5 26efec771b5813f3120d65ec35159a58 vim-7.0_alpha20050825-gentoo-patches.tar.bz2 12225
diff --git a/app-editors/gvim/files/digest-gvim-7.0_alpha20050922 b/app-editors/gvim/files/digest-gvim-7.0_alpha20050922
new file mode 100644
index 000000000000..bd7360169e18
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-7.0_alpha20050922
@@ -0,0 +1,2 @@
+MD5 a05f0f0b9578cbd528d08aa7e23a10be vim-7.0_alpha20050922.tar.bz2 6384017
+MD5 18bc319540a1e33d233c39e8fbfb71a7 vim-7.0_alpha20050922-gentoo-patches.tar.bz2 11131
diff --git a/app-editors/gvim/gvim-7.0_alpha20050825.ebuild b/app-editors/gvim/gvim-7.0_alpha20050922.ebuild
index 72d31a8dc8e7..df6753090856 100644
--- a/app-editors/gvim/gvim-7.0_alpha20050825.ebuild
+++ b/app-editors/gvim/gvim-7.0_alpha20050922.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha20050825.ebuild,v 1.1 2005/08/25 15:52:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20050922.ebuild,v 1.1 2005/09/22 20:45:26 ciaranm Exp $
 
 inherit vim
 
@@ -18,22 +18,16 @@ SRC_URI="${SRC_URI}
 S=${WORKDIR}/vim${VIM_VERSION/.*}
 DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aqua gnome gtk gtk2 motif nextaw qt"
+IUSE="aqua gnome gtk 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* )
-			)
+			>=x11-libs/gtk+-2.4
+			virtual/xft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
 		)
 		!gtk? (
 			qt? (
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 30d32b8f102f..95e0b819b79a 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.172 2005/09/22 19:51:44 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.173 2005/09/22 20:44:24 ciaranm Exp $
+
+*vim-core-7.0_alpha20050922 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -vim-core-7.0_alpha20050825.ebuild, +vim-core-7.0_alpha20050922.ebuild:
+  New vim7 snapshot.
 
 *vim-core-6.3.086 (22 Sep 2005)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 4129e7c6d944..f09e39edb719 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 08b45bd7dd694cfd7e55e35df99a3019 vim-core-7.0_alpha20050922.ebuild 754
 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
@@ -14,6 +12,7 @@ MD5 bf7ffc1fe1d1852f15eb7e5f15c17482 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 516fcbe7fcdff28cd13524a3fc8b95eb files/digest-vim-core-7.0_alpha20050922 163
 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
@@ -22,10 +21,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)
-
-iD8DBQFDMwuOLLFUmVNQ7rkRAoE4AJ9xIynMYZkQ3tkJqn3ktD/aF4DtDgCbB99l
-5OwRER59m0tMk3uCsovt/+c=
-=KjCY
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050825 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050825
deleted file mode 100644
index 10ca75ef455d..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050825
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be93013cb325b791d9dee017062c5f1a vim-7.0_alpha20050825.tar.bz2 6334863
-MD5 26efec771b5813f3120d65ec35159a58 vim-7.0_alpha20050825-gentoo-patches.tar.bz2 12225
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050922 b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050922
new file mode 100644
index 000000000000..bd7360169e18
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-7.0_alpha20050922
@@ -0,0 +1,2 @@
+MD5 a05f0f0b9578cbd528d08aa7e23a10be vim-7.0_alpha20050922.tar.bz2 6384017
+MD5 18bc319540a1e33d233c39e8fbfb71a7 vim-7.0_alpha20050922-gentoo-patches.tar.bz2 11131
diff --git a/app-editors/vim-core/vim-core-7.0_alpha20050825.ebuild b/app-editors/vim-core/vim-core-7.0_alpha20050922.ebuild
index 4ed551302bcc..0e4ffb460abc 100644
--- a/app-editors/vim-core/vim-core-7.0_alpha20050825.ebuild
+++ b/app-editors/vim-core/vim-core-7.0_alpha20050922.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha20050825.ebuild,v 1.1 2005/08/25 15:51:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_alpha20050922.ebuild,v 1.1 2005/09/22 20:44:24 ciaranm Exp $
 
 inherit vim
 
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index b5010dca4b13..069bc7acadb9 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.188 2005/09/22 19:52:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.189 2005/09/22 20:44:56 ciaranm Exp $
+
+*vim-7.0_alpha20050922 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -vim-7.0_alpha20050825.ebuild, +vim-7.0_alpha20050922.ebuild:
+  New vim7 snapshot.
 
 *vim-6.3.086 (22 Sep 2005)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 0904c916cab1..119e66fdf5af 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 44a0710ec5ead2278a9e6cd748973955 vim-6.3.086.ebuild 1019
-MD5 bee92c86dd7765be7882de88146435d6 vim-7.0_alpha20050825.ebuild 750
 MD5 6030d19952620c2d5c7cdd57406ce5f1 vim-6.3.074.ebuild 894
+MD5 bde3c8caf4f5b8adb0f9e3147b6958cb vim-7.0_alpha20050922.ebuild 807
 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 ba41f6877db500c632d804a1a1089820 ChangeLog 27250
 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 94d109de61a8e47f057a1a07ecbc491e files/digest-vim-6.3.075 349
 MD5 5b2c9a43806c1fd57bde2ee1462947b2 files/digest-vim-6.3.074 275
+MD5 516fcbe7fcdff28cd13524a3fc8b95eb files/digest-vim-7.0_alpha20050922 163
 MD5 87fe7821e180647f3bf48ed099a22b83 files/vim-completion 998
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDMwuvLLFUmVNQ7rkRAv/+AJ9Kt5hfaRSdX1ErteXILPOh2evARgCeO/3G
-a2ZO4zOqQthTbUeVr6JXGhQ=
-=ZVGX
------END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050825 b/app-editors/vim/files/digest-vim-7.0_alpha20050825
deleted file mode 100644
index 10ca75ef455d..000000000000
--- a/app-editors/vim/files/digest-vim-7.0_alpha20050825
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be93013cb325b791d9dee017062c5f1a vim-7.0_alpha20050825.tar.bz2 6334863
-MD5 26efec771b5813f3120d65ec35159a58 vim-7.0_alpha20050825-gentoo-patches.tar.bz2 12225
diff --git a/app-editors/vim/files/digest-vim-7.0_alpha20050922 b/app-editors/vim/files/digest-vim-7.0_alpha20050922
new file mode 100644
index 000000000000..bd7360169e18
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-7.0_alpha20050922
@@ -0,0 +1,2 @@
+MD5 a05f0f0b9578cbd528d08aa7e23a10be vim-7.0_alpha20050922.tar.bz2 6384017
+MD5 18bc319540a1e33d233c39e8fbfb71a7 vim-7.0_alpha20050922-gentoo-patches.tar.bz2 11131
diff --git a/app-editors/vim/vim-7.0_alpha20050825.ebuild b/app-editors/vim/vim-7.0_alpha20050922.ebuild
index 5525d734b967..f5de1db803d0 100644
--- a/app-editors/vim/vim-7.0_alpha20050825.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050922.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha20050825.ebuild,v 1.2 2005/09/05 04:18:29 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050922.ebuild,v 1.1 2005/09/22 20:44:56 ciaranm Exp $
 
 inherit vim
 
@@ -20,5 +20,6 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE=""
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}"
-RDEPEND="${RDEPEND} !app-editors/nvi"
+	!minimal? ( ~app-editors/vim-core-${PV} )"
+RDEPEND="${RDEPEND} !app-editors/nvi
+	!minimal? ( ~app-editors/vim-core-${PV} )"