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

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

4 files changed, 28 insertions, 8 deletions

diff --git a/app-vim/svncommand/ChangeLog b/app-vim/svncommand/ChangeLog
index 8a1f71eef7d6..2e30261cde61 100644
--- a/app-vim/svncommand/ChangeLog
+++ b/app-vim/svncommand/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-vim/svncommand
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/svncommand/ChangeLog,v 1.5 2005/05/03 23:15:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/svncommand/ChangeLog,v 1.6 2005/05/23 08:47:24 ciaranm Exp $
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> svncommand-0.2.ebuild,
+  svncommand-1.67.3.ebuild:
+  Conflict between vimspell and svncommand maps, so make them block. Bug #91965
 
 *svncommand-1.67.3 (03 May 2005)
 *svncommand-0.2 (03 May 2005)
diff --git a/app-vim/svncommand/Manifest b/app-vim/svncommand/Manifest
index 60cf54e149d0..574eaaf0cd9e 100644
--- a/app-vim/svncommand/Manifest
+++ b/app-vim/svncommand/Manifest
@@ -1,6 +1,16 @@
-MD5 88cc785529966dcd174384b6648afce3 svncommand-0.2.ebuild 549
-MD5 97a9177bde450c1a6ceca4db008829b5 svncommand-1.67.3.ebuild 556
-MD5 fcfd2405f58b4c84994fdebae1dc9847 ChangeLog 938
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 985c286bd836a37f97ea739c7241b11f ChangeLog 1121
 MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
+MD5 f4209e6c21c87c13738d8a34037caec9 svncommand-1.67.3.ebuild 611
+MD5 58605e8db7f1bf2b7513582c45d9fb18 svncommand-0.2.ebuild 604
 MD5 db4b68c7429801caa48e64135a322b27 files/digest-svncommand-0.2 65
 MD5 cdde5e4fa96bd6b25680bab4ac98f921 files/digest-svncommand-1.67.3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCkZinLLFUmVNQ7rkRAiXpAJ0U6lA4IzZzIklD72grgCW8hZ6HjwCdGMM/
+yHnOQhnspCRi1hnH3gGuQ6w=
+=g03u
+-----END PGP SIGNATURE-----
diff --git a/app-vim/svncommand/svncommand-0.2.ebuild b/app-vim/svncommand/svncommand-0.2.ebuild
index d08bd1d62912..23964aac23cd 100644
--- a/app-vim/svncommand/svncommand-0.2.ebuild
+++ b/app-vim/svncommand/svncommand-0.2.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/svncommand/svncommand-0.2.ebuild,v 1.1 2005/05/03 23:15:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/svncommand/svncommand-0.2.ebuild,v 1.2 2005/05/23 08:47:24 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -10,7 +10,10 @@ LICENSE="as-is"
 KEYWORDS="x86 sparc ~hppa ~amd64 alpha ia64"
 IUSE=""
 
-RDEPEND="${RDEPEND} dev-util/subversion"
+# vimspell map conflict, bug #91965
+RDEPEND="${RDEPEND}
+	dev-util/subversion
+	!app-vim/vimspell"
 
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=922"
 
diff --git a/app-vim/svncommand/svncommand-1.67.3.ebuild b/app-vim/svncommand/svncommand-1.67.3.ebuild
index 2dab96e4acd2..ea7fefb6879f 100644
--- a/app-vim/svncommand/svncommand-1.67.3.ebuild
+++ b/app-vim/svncommand/svncommand-1.67.3.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/svncommand/svncommand-1.67.3.ebuild,v 1.1 2005/05/03 23:15:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/svncommand/svncommand-1.67.3.ebuild,v 1.2 2005/05/23 08:47:24 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -10,7 +10,10 @@ LICENSE="as-is"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="${RDEPEND} dev-util/subversion"
+# vimspell map conflict, bug #91965
+RDEPEND="${RDEPEND}
+	dev-util/subversion
+	!app-vim/vimspell"
 
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=922"