Remove block against app-editors/nvi

Package-Manager: portage-2.1.2_pre1

3 files changed, 15 insertions, 11 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/Manifest b/app-editors/vim/Manifest
index 21a1b7bc2ca9..a86b0c617cf3 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -18,10 +18,10 @@ EBUILD vim-6.4.ebuild 1007 RMD160 ed22ba5f37345dcfbcafa343b8780200c50e082c SHA1
 MD5 8351d8850a582a42a6c7c0ffa5e6e702 vim-6.4.ebuild 1007
 RMD160 ed22ba5f37345dcfbcafa343b8780200c50e082c vim-6.4.ebuild 1007
 SHA256 c77b527cca8f520ee0b4dbb4fb81a6d14f611508a0a149a53e1a838d3d51e886 vim-6.4.ebuild 1007
-EBUILD vim-7.0.109.ebuild 866 RMD160 f8d62026059730665cca6a3c208b9daaaaedee96 SHA1 faa89f3d61f372f5cbfa3afc80a7ba0a2f3690c7 SHA256 d82a12b2f08244e0c03a9f8ee25459d1e8c061883bd04578a389567fe90e01f7
-MD5 ac7c962bd5074b2799cddcc25d524ab9 vim-7.0.109.ebuild 866
-RMD160 f8d62026059730665cca6a3c208b9daaaaedee96 vim-7.0.109.ebuild 866
-SHA256 d82a12b2f08244e0c03a9f8ee25459d1e8c061883bd04578a389567fe90e01f7 vim-7.0.109.ebuild 866
+EBUILD vim-7.0.109.ebuild 878 RMD160 47bc46978216a46e737a850700e4423efc4806d2 SHA1 09c9f3b20f655de41cfa4ef1f8803e68f3d4129c SHA256 f979e35ca1a86f7fa1165197d3899c4568580ba10079c3a3959cd3757116e5e0
+MD5 d082acd7d998d39642fc6e3c44f2cc53 vim-7.0.109.ebuild 878
+RMD160 47bc46978216a46e737a850700e4423efc4806d2 vim-7.0.109.ebuild 878
+SHA256 f979e35ca1a86f7fa1165197d3899c4568580ba10079c3a3959cd3757116e5e0 vim-7.0.109.ebuild 878
 EBUILD vim-7.0.17.ebuild 862 RMD160 25e514adb4db2a019e4eeff67b3c0bb7f3fc2714 SHA1 d0cd60bb968a0e52350ece30d82aeff09231031d SHA256 67737574fbb673b3e0e248cd2c4e4860fdd7f7db232758d5dc4550b7745d35e9
 MD5 91af700234af7df01bb3d5fcc16c1d0e vim-7.0.17.ebuild 862
 RMD160 25e514adb4db2a019e4eeff67b3c0bb7f3fc2714 vim-7.0.17.ebuild 862
@@ -30,10 +30,10 @@ EBUILD vim-7.0.91.ebuild 866 RMD160 d80e38ffee3bc4e9ff935312249683f80bbddc67 SHA
 MD5 56fbb0876e0ff76812749c4d403fb1b6 vim-7.0.91.ebuild 866
 RMD160 d80e38ffee3bc4e9ff935312249683f80bbddc67 vim-7.0.91.ebuild 866
 SHA256 d27e9751c4a10bc028f5b575dadeba8a23b1cda1cd120ca29c31449644e7e991 vim-7.0.91.ebuild 866
-MISC ChangeLog 33740 RMD160 9c5edcd716d9c151ce1b90d5878587432da1219b SHA1 058ce9e528714a7345d676973631a158a1f39b88 SHA256 ecc19e54d7f621309344dfe4ef3f57d07da5454c796a1bc40ec398316512c6f5
-MD5 fcfb3e1f808c9b57a1bc31b49a2821f1 ChangeLog 33740
-RMD160 9c5edcd716d9c151ce1b90d5878587432da1219b ChangeLog 33740
-SHA256 ecc19e54d7f621309344dfe4ef3f57d07da5454c796a1bc40ec398316512c6f5 ChangeLog 33740
+MISC ChangeLog 33844 RMD160 f96eeb4cdc86c1ac7f0e65c022caf2c353770e5e SHA1 8ff94d4499fd78dc6157eefb3b8fbba037a284c1 SHA256 e20e885d99f714d1f85a812f5917f4b2fc8afc7cf850f2edd12d4a3b8080486e
+MD5 1276d49caabd18224061ba71a1d908f4 ChangeLog 33844
+RMD160 f96eeb4cdc86c1ac7f0e65c022caf2c353770e5e ChangeLog 33844
+SHA256 e20e885d99f714d1f85a812f5917f4b2fc8afc7cf850f2edd12d4a3b8080486e ChangeLog 33844
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 metadata.xml 156
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} )"