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

Package-Manager: portage-2.0.51.22-r1 screaming llama edition

7 files changed, 41 insertions, 21 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/Manifest b/app-vim/vimspell/Manifest
index b054c698e03a..4444d6d9ad20 100644
--- a/app-vim/vimspell/Manifest
+++ b/app-vim/vimspell/Manifest
@@ -1,14 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa9476957d8452f28700aa7948049248 ChangeLog 3046
 MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
-MD5 dcb91e375dda306d4bdcac85e4e76326 ChangeLog 2792
-MD5 729e825228035b73f2266eaafc36ed7f vimspell-1.70.ebuild 2310
-MD5 e5837d99738147ac8bc95e7d4a4f1de4 vimspell-1.84.ebuild 2319
-MD5 26d265b087eb144a17f256aaf6a01b0e vimspell-1.95.ebuild 2357
-MD5 3b08bffa34c4609e648f370a18bc29a1 vimspell-1.84-r1.ebuild 2478
-MD5 ae63ce01d674ff881433c9d7029d2761 vimspell-1.84-r2.ebuild 2573
-MD5 20fccc61346c6688affc87332b25c0e3 files/digest-vimspell-1.95 65
-MD5 bff67b402df306aff4515298e7472816 files/vimspell-1.84-aspell-0.6.patch 6219
+MD5 9960b454e9952bd6462e04f6f444ae8d vimspell-1.70.ebuild 2381
+MD5 4113b67cb97e2d46a7e09ab781379b50 vimspell-1.84-r1.ebuild 2549
+MD5 fbbb0d508fd9f5798d4d4bd61c2d3c8d vimspell-1.84-r2.ebuild 2647
+MD5 c8f25a7adb3981454eb4405460cc9317 vimspell-1.84.ebuild 2389
+MD5 30e72490fb329b7d51be29f4eea1627c vimspell-1.95.ebuild 2430
 MD5 6a4ee637c8498ba26e82c61844aa5e55 files/digest-vimspell-1.70 65
+MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84 65
 MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84-r1 65
-MD5 520de6488ff85f36d4f694cff73dd30b files/vimspell-1.84-explorersyntax.patch 509
 MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84-r2 65
-MD5 7101dd811b1925b8c3eb3c8544a289c0 files/digest-vimspell-1.84 65
+MD5 20fccc61346c6688affc87332b25c0e3 files/digest-vimspell-1.95 65
+MD5 bff67b402df306aff4515298e7472816 files/vimspell-1.84-aspell-0.6.patch 6219
+MD5 520de6488ff85f36d4f694cff73dd30b files/vimspell-1.84-explorersyntax.patch 509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCkZoULLFUmVNQ7rkRAtPuAJ9HMejmuzJMeQNZzedD7qL4cSePXQCdGC+J
+Z8pw7ISnXtyI6dYh9eaHTfU=
+=zwFt
+-----END PGP SIGNATURE-----
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}