summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kelly <pioto@gentoo.org>2006-09-21 00:19:21 +0000
committerMike Kelly <pioto@gentoo.org>2006-09-21 00:19:21 +0000
commit97b184a096d6f96ac1bb6da3292adb982a04bae1 (patch)
treeeccd68ae78889717410e30acc14b0c1807fecd45 /app-editors/vim
parentFixed HOMEPAGE (diff)
downloadgentoo-2-97b184a096d6f96ac1bb6da3292adb982a04bae1.tar.gz
gentoo-2-97b184a096d6f96ac1bb6da3292adb982a04bae1.tar.bz2
gentoo-2-97b184a096d6f96ac1bb6da3292adb982a04bae1.zip
Remove block against app-editors/nvi
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'app-editors/vim')
-rw-r--r--app-editors/vim/ChangeLog5
-rw-r--r--app-editors/vim/vim-7.0.109.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index a39c30f0cf3d..14e04c73c362 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/vim
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.238 2006/09/20 03:58:56 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.239 2006/09/21 00:19:21 pioto Exp $
+
+ 20 Sep 2006; Mike Kelly <pioto@pioto.org> vim-7.0.109.ebuild:
+ Remove block against app-editors/nvi
*vim-7.0.109 (20 Sep 2006)
diff --git a/app-editors/vim/vim-7.0.109.ebuild b/app-editors/vim/vim-7.0.109.ebuild
index 9947610bb11f..59740c505b71 100644
--- a/app-editors/vim/vim-7.0.109.ebuild
+++ b/app-editors/vim/vim-7.0.109.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0.109.ebuild,v 1.1 2006/09/20 03:58:56 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.0.109.ebuild,v 1.2 2006/09/21 00:19:21 pioto Exp $
inherit vim
@@ -21,5 +21,6 @@ IUSE=""
PROVIDE="virtual/editor"
DEPEND="${DEPEND}
!minimal? ( ~app-editors/vim-core-${PV} )"
-RDEPEND="${RDEPEND} !app-editors/nvi
+RDEPEND="${RDEPEND}
+ !<app-editors/nvi-1.81.5-r4
!minimal? ( ~app-editors/vim-core-${PV} )"