From: Ciaran McCreesh Date: Sat, 27 Nov 2004 19:12:55 +0000 (+0000) Subject: Conflicts with calendar, bug #62677 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=618a29fd1eae99fc2066f552ff47c9fd152f359b;p=gentoo.git Conflicts with calendar, bug #62677 --- diff --git a/app-vim/cvscommand/ChangeLog b/app-vim/cvscommand/ChangeLog index 47c9f6651e51..f45eefacea67 100644 --- a/app-vim/cvscommand/ChangeLog +++ b/app-vim/cvscommand/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-vim/cvscommand # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/cvscommand/ChangeLog,v 1.12 2004/10/26 12:01:03 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/cvscommand/ChangeLog,v 1.13 2004/11/27 19:12:55 ciaranm Exp $ + + 27 Nov 2004; Ciaran McCreesh cvscommand-1.65.ebuild: + Conflicts with calendar, bug #62677 26 Oct 2004; Tom Martin cvscommand-1.65.ebuild: Marked ~amd64. diff --git a/app-vim/cvscommand/cvscommand-1.65.ebuild b/app-vim/cvscommand/cvscommand-1.65.ebuild index 547844f89b45..a78e8473bd92 100644 --- a/app-vim/cvscommand/cvscommand-1.65.ebuild +++ b/app-vim/cvscommand/cvscommand-1.65.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/cvscommand/cvscommand-1.65.ebuild,v 1.6 2004/10/26 12:01:03 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/cvscommand/cvscommand-1.65.ebuild,v 1.7 2004/11/27 19:12:55 ciaranm Exp $ inherit vim-plugin @@ -11,3 +11,5 @@ KEYWORDS="alpha ia64 ~ppc sparc x86 ~amd64" IUSE="" VIM_PLUGIN_HELPFILES="cvcsommand-contents" +# conflict, bug 62677 +RDEPEND="!app-vim/calendar"