summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaranm@gentoo.org>2004-11-27 19:12:55 +0000
committerCiaran McCreesh <ciaranm@gentoo.org>2004-11-27 19:12:55 +0000
commitbbb3c4f2d072f0476f0dc24d122a73a24d119ffb (patch)
tree5f5df659a9421c20af5432bd6d48596759ce4b4c /app-vim
parentConflicts with cvscommand, bug #62677 (Manifest recommit) (diff)
downloadgentoo-2-bbb3c4f2d072f0476f0dc24d122a73a24d119ffb.tar.gz
gentoo-2-bbb3c4f2d072f0476f0dc24d122a73a24d119ffb.tar.bz2
gentoo-2-bbb3c4f2d072f0476f0dc24d122a73a24d119ffb.zip
Conflicts with calendar, bug #62677
Diffstat (limited to 'app-vim')
-rw-r--r--app-vim/cvscommand/ChangeLog5
-rw-r--r--app-vim/cvscommand/cvscommand-1.65.ebuild4
2 files changed, 7 insertions, 2 deletions
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 <ciaranm@gentoo.org> cvscommand-1.65.ebuild:
+ Conflicts with calendar, bug #62677
26 Oct 2004; Tom Martin <slarti@gentoo.org> 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"