Remove virtual/x11 from dependencies.

(Portage version: 2.1.3_rc8)

8 files changed, 28 insertions, 35 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 3939af48c768..f758479856a6 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.240 2007/07/15 16:35:20 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.241 2007/07/22 08:39:35 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> gvim-6.4.ebuild,
+  gvim-7.0.174.ebuild, gvim-7.0.235.ebuild, gvim-7.1.ebuild,
+  gvim-7.1-r1.ebuild, gvim-7.1.002.ebuild, gvim-7.1.028.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *gvim-7.1.028 (15 Jul 2007)
 
diff --git a/app-editors/gvim/gvim-6.4.ebuild b/app-editors/gvim/gvim-6.4.ebuild
index 84e531511570..53ee6ab5f874 100644
--- a/app-editors/gvim/gvim-6.4.ebuild
+++ b/app-editors/gvim/gvim-6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.11 2005/12/14 05:07:18 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.12 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -24,12 +24,12 @@ IUSE="gnome gtk motif nls"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	gtk? (
 		>=x11-libs/gtk+-2.6
 		virtual/xft
 		gnome? ( >=gnome-base/libgnomeui-2.6 )
 	)
 	!gtk? ( motif? ( x11-libs/openmotif )
-		!motif? ( || ( x11-libs/libXaw virtual/x11 ) )
+		!motif? ( x11-libs/libXaw )
 	)"
diff --git a/app-editors/gvim/gvim-7.0.174.ebuild b/app-editors/gvim/gvim-7.0.174.ebuild
index b8e325dc86ae..ae90cdb82ce9 100644
--- a/app-editors/gvim/gvim-7.0.174.ebuild
+++ b/app-editors/gvim/gvim-7.0.174.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.174.ebuild,v 1.10 2007/05/13 04:07:05 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.174.ebuild,v 1.11 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -37,9 +37,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"
diff --git a/app-editors/gvim/gvim-7.0.235.ebuild b/app-editors/gvim/gvim-7.0.235.ebuild
index 9bd4f5e6884b..a167a6c667ea 100644
--- a/app-editors/gvim/gvim-7.0.235.ebuild
+++ b/app-editors/gvim/gvim-7.0.235.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.235.ebuild,v 1.12 2007/05/13 06:32:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.235.ebuild,v 1.13 2007/07/22 08:39:35 omp Exp $
 
 inherit vim
 
@@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -37,9 +37,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"
diff --git a/app-editors/gvim/gvim-7.1-r1.ebuild b/app-editors/gvim/gvim-7.1-r1.ebuild
index aa3d206cc253..90496faa2be6 100644
--- a/app-editors/gvim/gvim-7.1-r1.ebuild
+++ b/app-editors/gvim/gvim-7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1-r1.ebuild,v 1.1 2007/05/14 10:16:15 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1-r1.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -35,9 +35,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"
diff --git a/app-editors/gvim/gvim-7.1.002.ebuild b/app-editors/gvim/gvim-7.1.002.ebuild
index 45225381a86d..b5761d6ff819 100644
--- a/app-editors/gvim/gvim-7.1.002.ebuild
+++ b/app-editors/gvim/gvim-7.1.002.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.002.ebuild,v 1.1 2007/05/31 05:52:53 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.002.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -37,9 +37,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"
diff --git a/app-editors/gvim/gvim-7.1.028.ebuild b/app-editors/gvim/gvim-7.1.028.ebuild
index 4c1da345aac3..1db0bddfa166 100644
--- a/app-editors/gvim/gvim-7.1.028.ebuild
+++ b/app-editors/gvim/gvim-7.1.028.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.028.ebuild,v 1.1 2007/07/15 16:35:20 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.028.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -37,9 +37,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"
diff --git a/app-editors/gvim/gvim-7.1.ebuild b/app-editors/gvim/gvim-7.1.ebuild
index 69a8520f9e8e..bb6ab87f1b6b 100644
--- a/app-editors/gvim/gvim-7.1.ebuild
+++ b/app-editors/gvim/gvim-7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.ebuild,v 1.1 2007/05/13 13:25:38 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.ebuild,v 1.2 2007/07/22 08:39:36 omp Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
+	x11-libs/libXext
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6
@@ -35,9 +35,7 @@ DEPEND="${DEPEND}
 				nextaw? (
 					x11-libs/neXtaw
 				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
+				!nextaw? ( x11-libs/libXaw )
 			)
 		)
 	)"