Conflicts with cvscommand, bug #62677

diff --git a/app-vim/calendar/ChangeLog b/app-vim/calendar/ChangeLog
index 43763539342f87d14a2156f73cacc050fa109011..22c37d64534208842d3f4aa225b2bad45d850a1c 100644 (file)
--- a/app-vim/calendar/ChangeLog
+++ b/app-vim/calendar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-vim/calendar
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/ChangeLog,v 1.11 2004/11/23 16:01:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/ChangeLog,v 1.12 2004/11/27 19:10:27 ciaranm Exp $
+
+  27 Nov 2004; Ciaran McCreesh <ciaranm@gentoo.org> calendar-1.4.ebuild:
+  Conflicts with cvscommand, bug #62677
 
 *calendar-1.4 (23 Nov 2004)
 

diff --git a/app-vim/calendar/calendar-1.4.ebuild b/app-vim/calendar/calendar-1.4.ebuild
index 9f5e9d885b1c0a6b23f0e46247febae5a6150cbd..ce437ed61944142d5783d8fedb49ebde4aaedc44 100644 (file)
--- a/app-vim/calendar/calendar-1.4.ebuild
+++ b/app-vim/calendar/calendar-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-1.4.ebuild,v 1.1 2004/11/23 16:01:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-1.4.ebuild,v 1.2 2004/11/27 19:10:27 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -14,3 +14,5 @@ VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a calendar window for vim. To start it, use the
 :Calendar command."
 
+# bug #62677
+RDEPEND="!app-vim/cvscommand"

diff --git a/app-vim/cvscommand/Manifest b/app-vim/cvscommand/Manifest
index 53c766973631dbec78c6fb39a5e86832fa2b654b..64823590913e02d26f5953c8fb319f53cf9cb349 100644 (file)
--- a/app-vim/cvscommand/Manifest
+++ b/app-vim/cvscommand/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe468ce835fd68d48c53616d76b91f24 cvscommand-1.63.ebuild 426
-MD5 e33da3bc607923b1fc6a78a735455331 cvscommand-1.65.ebuild 475
-MD5 9f257c3929ae584d9682386fdbecbdb1 ChangeLog 1367
+MD5 826b2a7a59bcdf038593ff1358e09b3a ChangeLog 1483
+MD5 13a50dfcd5e171fc85711cf154ec0e7d cvscommand-1.65.ebuild 526
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 a4656469986a2ce622163caf9ad436fe files/digest-cvscommand-1.63 67
+MD5 fe468ce835fd68d48c53616d76b91f24 cvscommand-1.63.ebuild 426
 MD5 f05d6d6bc01af408975de529176e388d files/digest-cvscommand-1.65 67
+MD5 a4656469986a2ce622163caf9ad436fe files/digest-cvscommand-1.63 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBfi6LCHk4+ZoBpvsRAsVaAJ9AulH2D1cEa6eXEl2qZ/shzljwcgCfT70f
-z/s5rJaPbufbLA0nHjGlJ3o=
-=ZWBb
+iD8DBQFBqNG0LLFUmVNQ7rkRArdAAJ9tiLwOJLVCM/miAA3fwCsuDBiZsQCfd10j
+BlMAhgplt4Jvq1acr+fGCqQ=
+=lkM5
 -----END PGP SIGNATURE-----