Block nvi and vim, bug #69852

(Portage version: 2.0.51.16)

11 files changed, 29 insertions, 11 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 72e050bd5f44..4d8d9efb6be8 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.22 2005/01/01 13:32:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.23 2005/02/10 15:03:29 ciaranm Exp $
+
+  10 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org> nvi-1.81.4.ebuild,
+  nvi-1.81.5-r1.ebuild, nvi-1.81.5-r2.ebuild, nvi-1.81.5.ebuild:
+  Block nvi and vim, bug #69852
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   nvi-1.81.5-r1.ebuild, nvi-1.81.5-r2.ebuild, nvi-1.81.5.ebuild:
diff --git a/app-editors/nvi/nvi-1.81.4.ebuild b/app-editors/nvi/nvi-1.81.4.ebuild
index 56d4d71ae244..3cd46c654cf7 100644
--- a/app-editors/nvi/nvi-1.81.4.ebuild
+++ b/app-editors/nvi/nvi-1.81.4.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-editors/nvi/nvi-1.81.4.ebuild,v 1.17 2005/01/01 13:32:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.4.ebuild,v 1.18 2005/02/10 15:03:29 ciaranm Exp $
 
 DESCRIPTION="Vi clone"
 SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
@@ -12,6 +12,7 @@ KEYWORDS="x86 ppc sparc"
 IUSE=""
 
 DEPEND=">=sys-libs/db-3.1"
+RDEPEND="${DEPEND} !app-editors/vim"
 
 PROVIDE="virtual/editor"
 
diff --git a/app-editors/nvi/nvi-1.81.5-r1.ebuild b/app-editors/nvi/nvi-1.81.5-r1.ebuild
index a6905e8fa5fe..83a29e376712 100644
--- a/app-editors/nvi/nvi-1.81.5-r1.ebuild
+++ b/app-editors/nvi/nvi-1.81.5-r1.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-editors/nvi/nvi-1.81.5-r1.ebuild,v 1.10 2005/01/01 13:32:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r1.ebuild,v 1.11 2005/02/10 15:03:29 ciaranm Exp $
 
 DESCRIPTION="Vi clone"
 HOMEPAGE="http://www.bostic.com/vi/"
@@ -13,6 +13,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	=sys-libs/db-3.2*"
+RDEPEND="${DEPEND} !app-editors/vim"
 PROVIDE="virtual/editor"
 
 src_unpack() {
diff --git a/app-editors/nvi/nvi-1.81.5-r2.ebuild b/app-editors/nvi/nvi-1.81.5-r2.ebuild
index 1ba1a227a2ac..b4a85ab4fac1 100644
--- a/app-editors/nvi/nvi-1.81.5-r2.ebuild
+++ b/app-editors/nvi/nvi-1.81.5-r2.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-editors/nvi/nvi-1.81.5-r2.ebuild,v 1.9 2005/01/01 13:32:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r2.ebuild,v 1.10 2005/02/10 15:03:29 ciaranm Exp $
 
 inherit eutils
 
@@ -15,6 +15,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	=sys-libs/db-3.2*"
+RDEPEND="${DEPEND} !app-editors/vim"
 PROVIDE="virtual/editor"
 
 src_unpack() {
diff --git a/app-editors/nvi/nvi-1.81.5.ebuild b/app-editors/nvi/nvi-1.81.5.ebuild
index 84be24b2f243..7d18bb7a1f7e 100644
--- a/app-editors/nvi/nvi-1.81.5.ebuild
+++ b/app-editors/nvi/nvi-1.81.5.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-editors/nvi/nvi-1.81.5.ebuild,v 1.14 2005/01/01 13:32:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5.ebuild,v 1.15 2005/02/10 15:03:29 ciaranm Exp $
 
 DESCRIPTION="Vi clone"
 HOMEPAGE="http://www.bostic.com/vi/"
@@ -13,6 +13,7 @@ IUSE=""
 
 DEPEND="=sys-libs/db-3*
 	!>=sys-libs/db-4"
+RDEPEND="${DEPEND} !app-editors/vim"
 
 PROVIDE="virtual/editor"
 
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index fc271ec369af..8aa911ed2315 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.147 2005/02/01 19:15:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.148 2005/02/10 15:03:38 ciaranm Exp $
+
+  10 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org> vim-6.3-r2.ebuild,
+  vim-6.3-r4.ebuild, vim-7.0_alpha20050122.ebuild,
+  vim-7.0_alpha20050126.ebuild, vim-7.0_alpha20050201.ebuild:
+  Block nvi and vim, bug #69852
 
 *vim-7.0_alpha20050201 (01 Feb 2005)
 
diff --git a/app-editors/vim/vim-6.3-r2.ebuild b/app-editors/vim/vim-6.3-r2.ebuild
index c671513ecc69..752914e8f38d 100644
--- a/app-editors/vim/vim-6.3-r2.ebuild
+++ b/app-editors/vim/vim-6.3-r2.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-editors/vim/vim-6.3-r2.ebuild,v 1.11 2005/01/15 11:35:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.3-r2.ebuild,v 1.12 2005/02/10 15:03:38 ciaranm Exp $
 
 inherit vim
 
@@ -21,3 +21,4 @@ IUSE="${IUSE} nls"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-6.3-r4.ebuild b/app-editors/vim/vim-6.3-r4.ebuild
index 41bec6a30244..62cb3a0398e6 100644
--- a/app-editors/vim/vim-6.3-r4.ebuild
+++ b/app-editors/vim/vim-6.3-r4.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-editors/vim/vim-6.3-r4.ebuild,v 1.1 2005/01/21 22:29:57 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.3-r4.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
 
 inherit vim
 
@@ -21,3 +21,4 @@ IUSE="${IUSE} nls"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050122.ebuild b/app-editors/vim/vim-7.0_alpha20050122.ebuild
index f56ae7e6ff04..96d634dc2510 100644
--- a/app-editors/vim/vim-7.0_alpha20050122.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050122.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-editors/vim/vim-7.0_alpha20050122.ebuild,v 1.1 2005/01/22 20:57:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050122.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
 
 inherit vim
 
@@ -22,3 +22,4 @@ IUSE="${IUSE}"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050126.ebuild b/app-editors/vim/vim-7.0_alpha20050126.ebuild
index 0c41b72601a9..1140e88b8dec 100644
--- a/app-editors/vim/vim-7.0_alpha20050126.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050126.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-editors/vim/vim-7.0_alpha20050126.ebuild,v 1.1 2005/01/26 21:03:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050126.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
 
 inherit vim
 
@@ -22,3 +22,4 @@ IUSE="${IUSE}"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND} !app-editors/nvi"
diff --git a/app-editors/vim/vim-7.0_alpha20050201.ebuild b/app-editors/vim/vim-7.0_alpha20050201.ebuild
index 3f94abd5560f..347b1594d9e2 100644
--- a/app-editors/vim/vim-7.0_alpha20050201.ebuild
+++ b/app-editors/vim/vim-7.0_alpha20050201.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-editors/vim/vim-7.0_alpha20050201.ebuild,v 1.1 2005/02/01 19:15:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0_alpha20050201.ebuild,v 1.2 2005/02/10 15:03:38 ciaranm Exp $
 
 inherit vim
 
@@ -22,3 +22,4 @@ IUSE="${IUSE}"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}"
+RDEPEND="${RDEPEND} !app-editors/nvi"