8 files changed, 26 insertions, 12 deletions
diff --git a/app-vim/autoalign/ChangeLog b/app-vim/autoalign/ChangeLog
index 0ca40e3aee57..68d1dceaddc7 100644
--- a/app-vim/autoalign/ChangeLog
+++ b/app-vim/autoalign/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-vim/autoalign
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/ChangeLog,v 1.19 2006/04/07 22:17:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/ChangeLog,v 1.20 2006/09/19 13:42:04 pioto Exp $
+
+  19 Sep 2006; Mike Kelly <pioto@pioto.org> autoalign-4.ebuild,
+  autoalign-5.ebuild, autoalign-6.ebuild, autoalign-8.ebuild:
+  Be sure we block >=vim-core-7, fixes bug #131276.
 
   07 Apr 2006; Bryan Østergaard <kloeri@gentoo.org metadata.xml:
   Remove ciaranm from metadata.xml.
diff --git a/app-vim/autoalign/autoalign-4.ebuild b/app-vim/autoalign/autoalign-4.ebuild
index 082b1b4a3f90..cc16170492ff 100644
--- a/app-vim/autoalign/autoalign-4.ebuild
+++ b/app-vim/autoalign/autoalign-4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-4.ebuild,v 1.8 2005/02/22 22:59:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-4.ebuild,v 1.9 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="x86 sparc mips ~ppc amd64 alpha ia64"
 IUSE=""
 
 RDEPEND=">=app-vim/align-28
-	>=app-vim/cecutil-3"
+	>=app-vim/cecutil-3
+	!>=app-editors/vim-core-7"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-vim/autoalign/autoalign-5.ebuild b/app-vim/autoalign/autoalign-5.ebuild
index 8f63389db1d6..922bc00c8ee9 100644
--- a/app-vim/autoalign/autoalign-5.ebuild
+++ b/app-vim/autoalign/autoalign-5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-5.ebuild,v 1.7 2005/06/05 12:10:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-5.ebuild,v 1.8 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 
diff --git a/app-vim/autoalign/autoalign-6.ebuild b/app-vim/autoalign/autoalign-6.ebuild
index 7b8b29dc8d93..96d640611913 100644
--- a/app-vim/autoalign/autoalign-6.ebuild
+++ b/app-vim/autoalign/autoalign-6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-6.ebuild,v 1.1 2005/10/20 16:58:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-6.ebuild,v 1.2 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/autoalign/autoalign-8.ebuild b/app-vim/autoalign/autoalign-8.ebuild
index e017f8a249c1..d9ce58a24858 100644
--- a/app-vim/autoalign/autoalign-8.ebuild
+++ b/app-vim/autoalign/autoalign-8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-8.ebuild,v 1.1 2006/02/11 03:08:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-8.ebuild,v 1.2 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/autoalign/files/digest-autoalign-4 b/app-vim/autoalign/files/digest-autoalign-4
index 030b122917fd..4c4c40f3f5d0 100644
--- a/app-vim/autoalign/files/digest-autoalign-4
+++ b/app-vim/autoalign/files/digest-autoalign-4
@@ -1 +1,3 @@
 MD5 0d2eb692a81f022176ed934083769486 autoalign-4.tar.bz2 4361
+RMD160 2ceaef80a15decafe2ec5626caafe0eb6cd6e305 autoalign-4.tar.bz2 4361
+SHA256 6d5178c6706ce12a484a6d0fcba7530931d40d9433bb9e7f4cfbc659d30aaf70 autoalign-4.tar.bz2 4361
diff --git a/app-vim/autoalign/files/digest-autoalign-5 b/app-vim/autoalign/files/digest-autoalign-5
index cc13273dfc4c..3f11d9bacef9 100644
--- a/app-vim/autoalign/files/digest-autoalign-5
+++ b/app-vim/autoalign/files/digest-autoalign-5
@@ -1 +1,3 @@
 MD5 48c6af34daf64975e5c0b830a1fe4f10 autoalign-5.tar.bz2 6021
+RMD160 378bfc2c0465418b6a9e3ebb715af2437b5b6a25 autoalign-5.tar.bz2 6021
+SHA256 8c5985c4c5a8c7707160064b0774c0dcf2778055074c3880fb10cb9995e12410 autoalign-5.tar.bz2 6021
diff --git a/app-vim/autoalign/files/digest-autoalign-6 b/app-vim/autoalign/files/digest-autoalign-6
index bdedd91d71dd..25ebd3e10482 100644
--- a/app-vim/autoalign/files/digest-autoalign-6
+++ b/app-vim/autoalign/files/digest-autoalign-6
@@ -1 +1,3 @@
 MD5 96946cacce7d8e30894a3086945b8de1 autoalign-6.tar.bz2 5622
+RMD160 1d99fe71321bb8dd7c0c4b6faa906710db7fb231 autoalign-6.tar.bz2 5622
+SHA256 abb086db1b3e87d42ec0d008874710e1c1143604f881b63c12a4985fda1c8ca0 autoalign-6.tar.bz2 5622