Can't install ctx and enhancedcommentify at the same time, bug #74897

diff --git a/app-vim/ctx/ChangeLog b/app-vim/ctx/ChangeLog
index 030b4a15cc7372177e2a5e7dcb6a6a655b92c2ee..535290a5bca5c42c02e0687adf8655011b102c39 100644 (file)
--- a/app-vim/ctx/ChangeLog
+++ b/app-vim/ctx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-vim/ctx
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/ctx/ChangeLog,v 1.6 2004/11/27 18:50:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/ctx/ChangeLog,v 1.7 2004/12/21 16:18:55 ciaranm Exp $
+
+  21 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> ctx-1.17.ebuild:
+  Can't install ctx and enhancedcommentify at the same time, bug #74897
 
   27 Nov 2004; Ciaran McCreesh <ciaranm@gentoo.org> ctx-1.17.ebuild:
   Added help text, bug #63319

diff --git a/app-vim/ctx/ctx-1.17.ebuild b/app-vim/ctx/ctx-1.17.ebuild
index f303c37fa8a9c00ed9ffcd056c4faa0dc2d152ef..21c06bf4cccede930ebf940a29c41fde4efa3de3 100644 (file)
--- a/app-vim/ctx/ctx-1.17.ebuild
+++ b/app-vim/ctx/ctx-1.17.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/ctx/ctx-1.17.ebuild,v 1.7 2004/11/27 18:50:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/ctx/ctx-1.17.ebuild,v 1.8 2004/12/21 16:18:55 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -10,3 +10,6 @@ LICENSE="GPL-2"
 KEYWORDS="x86 alpha ia64 ~ppc"
 IUSE=""
 VIM_PLUGIN_HELPURI="http://www.bluweb.com/us/chouser/proj/ctx/"
+
+# bug #74897
+RDEPEND="!app-vim/enhancedcommentify"

diff --git a/app-vim/enhancedcommentify/ChangeLog b/app-vim/enhancedcommentify/ChangeLog
index ad8328aef98e9c674f1efc9f8afff53e1c5fee62..9aec62f3a8e8a8a5579034e48661f115a7bcc8f8 100644 (file)
--- a/app-vim/enhancedcommentify/ChangeLog
+++ b/app-vim/enhancedcommentify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-vim/enhancedcommentify
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/enhancedcommentify/ChangeLog,v 1.13 2004/09/19 19:52:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/enhancedcommentify/ChangeLog,v 1.14 2004/12/21 16:16:34 ciaranm Exp $
+
+  21 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  enhancedcommentify-2.1-r1.ebuild:
+  Can't install ctx and enhancedcommentify at the same time, bug #74897
 
   19 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
   enhancedcommentify-2.1-r1.ebuild:

diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.1-r1.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.1-r1.ebuild
index 93bc4c6d7b9529cc8226b5a3496236c38cd196c7..ea247c9ce95c0291f52a5deeb78f16681792d5cb 100644 (file)
--- a/app-vim/enhancedcommentify/enhancedcommentify-2.1-r1.ebuild
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.1-r1.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/enhancedcommentify/enhancedcommentify-2.1-r1.ebuild,v 1.7 2004/10/08 02:29:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/enhancedcommentify/enhancedcommentify-2.1-r1.ebuild,v 1.8 2004/12/21 16:16:34 ciaranm Exp $
 
 inherit vim-plugin
 
@@ -13,3 +13,6 @@ KEYWORDS="alpha amd64 ia64 mips ~ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="EnhancedCommentify"
+
+# bug #74897
+RDEPEND="!app-vim/ctx"