Conflict between vimspell and svncommand maps, so make them block. Bug #91965

(Portage version: 2.0.51.22-r1 screaming llama edition)

6 files changed, 21 insertions, 11 deletions

diff --git a/app-vim/vimspell/ChangeLog b/app-vim/vimspell/ChangeLog
index 245c50c494cc..635edb92fe7f 100644
--- a/app-vim/vimspell/ChangeLog
+++ b/app-vim/vimspell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-vim/vimspell
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/ChangeLog,v 1.22 2005/04/24 12:22:22 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/ChangeLog,v 1.23 2005/05/23 08:53:30 ciaranm Exp $
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> vimspell-1.70.ebuild,
+  vimspell-1.84.ebuild, vimspell-1.84-r1.ebuild, vimspell-1.84-r2.ebuild,
+  vimspell-1.95.ebuild:
+  Conflict between vimspell and svncommand maps, so make them block. Bug #91965
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   vimspell-1.84-r2.ebuild:
diff --git a/app-vim/vimspell/vimspell-1.70.ebuild b/app-vim/vimspell/vimspell-1.70.ebuild
index f19012a49cfe..465c2389f0fb 100644
--- a/app-vim/vimspell/vimspell-1.70.ebuild
+++ b/app-vim/vimspell/vimspell-1.70.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-vim/vimspell/vimspell-1.70.ebuild,v 1.9 2005/01/01 16:56:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.70.ebuild,v 1.10 2005/05/23 08:53:30 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -18,7 +18,8 @@ IUSE=""
 #   to aspell instead of ispell
 # 20:06 <@seemant> for the simple reason that ispell blows dogs
 # So we'll just force people to use aspell...
-RDEPEND="$RDEPEND app-text/aspell"
+# svncommand block is for a map conflict, bug #91965
+RDEPEND="$RDEPEND app-text/aspell !app-vim/svncommand"
 
 function src_unpack() {
 	unpack ${A}
diff --git a/app-vim/vimspell/vimspell-1.84-r1.ebuild b/app-vim/vimspell/vimspell-1.84-r1.ebuild
index 28abdb5a275d..91eed427de3e 100644
--- a/app-vim/vimspell/vimspell-1.84-r1.ebuild
+++ b/app-vim/vimspell/vimspell-1.84-r1.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-vim/vimspell/vimspell-1.84-r1.ebuild,v 1.9 2005/01/01 16:56:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.84-r1.ebuild,v 1.10 2005/05/23 08:53:30 ciaranm Exp $
 
 inherit eutils vim-plugin
 
@@ -20,7 +20,8 @@ VIM_PLUGIN_HELPFILES="vimspell"
 #   to aspell instead of ispell
 # 20:06 <@seemant> for the simple reason that ispell blows dogs
 # So we'll just force people to use aspell...
-RDEPEND="$RDEPEND app-text/aspell"
+# svncommand block is for a map conflict, bug #91965
+RDEPEND="$RDEPEND app-text/aspell !app-vim/svncommand"
 
 function src_unpack() {
 	unpack ${A}
diff --git a/app-vim/vimspell/vimspell-1.84-r2.ebuild b/app-vim/vimspell/vimspell-1.84-r2.ebuild
index 1e89a70a2892..dced35960814 100644
--- a/app-vim/vimspell/vimspell-1.84-r2.ebuild
+++ b/app-vim/vimspell/vimspell-1.84-r2.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-vim/vimspell/vimspell-1.84-r2.ebuild,v 1.7 2005/04/24 12:22:22 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.84-r2.ebuild,v 1.8 2005/05/23 08:53:30 ciaranm Exp $
 
 inherit eutils vim-plugin
 
@@ -20,7 +20,8 @@ VIM_PLUGIN_HELPFILES="vimspell"
 #   to aspell instead of ispell
 # 20:06 <@seemant> for the simple reason that ispell blows dogs
 # So we'll just force people to use aspell...
-RDEPEND="$RDEPEND app-text/aspell"
+# svncommand block is for a map conflict, bug #91965
+RDEPEND="$RDEPEND app-text/aspell !app-vim/svncommand"
 
 function src_unpack() {
 	unpack ${A}
diff --git a/app-vim/vimspell/vimspell-1.84.ebuild b/app-vim/vimspell/vimspell-1.84.ebuild
index 1f5363340f66..6e2950482014 100644
--- a/app-vim/vimspell/vimspell-1.84.ebuild
+++ b/app-vim/vimspell/vimspell-1.84.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-vim/vimspell/vimspell-1.84.ebuild,v 1.6 2005/01/01 16:56:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.84.ebuild,v 1.7 2005/05/23 08:53:30 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -18,7 +18,8 @@ IUSE=""
 #   to aspell instead of ispell
 # 20:06 <@seemant> for the simple reason that ispell blows dogs
 # So we'll just force people to use aspell...
-RDEPEND="$RDEPEND app-text/aspell"
+# svncommand block is for a map conflict, bug #91965
+RDEPEND="$RDEPEND app-text/aspell !app-vim/svncommand"
 
 function src_unpack() {
 	unpack ${A}
diff --git a/app-vim/vimspell/vimspell-1.95.ebuild b/app-vim/vimspell/vimspell-1.95.ebuild
index 8ef51eb4be7d..dacd8a8f3f07 100644
--- a/app-vim/vimspell/vimspell-1.95.ebuild
+++ b/app-vim/vimspell/vimspell-1.95.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-vim/vimspell/vimspell-1.95.ebuild,v 1.1 2005/01/06 05:17:05 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimspell/vimspell-1.95.ebuild,v 1.2 2005/05/23 08:53:30 ciaranm Exp $
 
 inherit eutils vim-plugin
 
@@ -20,7 +20,8 @@ VIM_PLUGIN_HELPFILES="vimspell"
 #   to aspell instead of ispell
 # 20:06 <@seemant> for the simple reason that ispell blows dogs
 # So we'll just force people to use aspell...
-RDEPEND="$RDEPEND app-text/aspell"
+# svncommand block is for a map conflict, bug #91965
+RDEPEND="$RDEPEND app-text/aspell !app-vim/svncommand"
 
 function src_unpack() {
 	unpack ${A}