Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

8 files changed, 54 insertions, 63 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index f6c5e09494d0..4fe2ed7f4e99 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.93 2007/05/21 10:31:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.94 2007/07/22 08:24:13 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> dasher-4.0.2.ebuild:
+  Remove virtual/x11 from dependencies.
 
   21 May 2007; Raúl Porcel <armin76@gentoo.org> dasher-4.2.2.ebuild:
   alpha stable wrt #164978
diff --git a/app-accessibility/dasher/dasher-4.0.2.ebuild b/app-accessibility/dasher/dasher-4.0.2.ebuild
index 25af34d440ce..2a6631c81613 100644
--- a/app-accessibility/dasher/dasher-4.0.2.ebuild
+++ b/app-accessibility/dasher/dasher-4.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.0.2.ebuild,v 1.11 2007/06/26 23:19:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.0.2.ebuild,v 1.12 2007/07/22 08:24:13 omp Exp $
 
 inherit eutils gnome2 autotools
 
@@ -22,10 +22,8 @@ RDEPEND="dev-libs/expat
 	>=gnome-base/libglade-2
 	>=dev-libs/glib-2
 	>=x11-libs/libwnck-1
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXtst )
-		virtual/x11 )
+	x11-libs/libX11
+	x11-libs/libXtst
 	gnome? (
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
@@ -39,11 +37,9 @@ RDEPEND="dev-libs/expat
 	cairo? ( >=x11-libs/gtk+-2.8 )"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-libs/libXt )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libXt
 	>=dev-util/intltool-0.28
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper"
diff --git a/app-accessibility/gnome-mag/ChangeLog b/app-accessibility/gnome-mag/ChangeLog
index d2dfb0a63d12..391c31a442b3 100644
--- a/app-accessibility/gnome-mag/ChangeLog
+++ b/app-accessibility/gnome-mag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/gnome-mag
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.112 2007/07/21 22:30:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.113 2007/07/22 08:26:34 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> gnome-mag-0.12.5.ebuild,
+  gnome-mag-0.13.1.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *gnome-mag-0.14.6 (21 Jul 2007)
 
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.12.5.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.12.5.ebuild
index 13e38741be12..b3168b659fd7 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.12.5.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.12.5.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-accessibility/gnome-mag/gnome-mag-0.12.5.ebuild,v 1.12 2007/01/23 01:56:31 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.12.5.ebuild,v 1.13 2007/07/22 08:26:34 omp Exp $
 
 inherit gnome2
 
@@ -18,18 +18,14 @@ RDEPEND=">=dev-libs/glib-1.3.11
 	>=gnome-extra/at-spi-1.5.2
 	>=gnome-base/orbit-2.3.100
 	dev-libs/popt
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXfixes )
-		virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXfixes"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.34.90"
 
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.13.1.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.13.1.ebuild
index 77d5d0d01711..201b5863c9e4 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.13.1.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.13.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-accessibility/gnome-mag/gnome-mag-0.13.1.ebuild,v 1.8 2007/01/21 22:22:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.13.1.ebuild,v 1.9 2007/07/22 08:26:34 omp Exp $
 
 inherit gnome2
 
@@ -18,18 +18,14 @@ RDEPEND=">=dev-libs/glib-1.3.11
 	>=gnome-extra/at-spi-1.5.2
 	>=gnome-base/orbit-2.3.100
 	dev-libs/popt
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXfixes )
-		virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXfixes"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35"
 
diff --git a/app-accessibility/gok/ChangeLog b/app-accessibility/gok/ChangeLog
index 957c0353fea7..6cbbf25cdd70 100644
--- a/app-accessibility/gok/ChangeLog
+++ b/app-accessibility/gok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/gok
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.95 2007/07/21 21:27:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.96 2007/07/22 08:28:50 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> gok-1.0.10.ebuild,
+  gok-1.2.0.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *gok-1.2.5 (21 Jul 2007)
 
diff --git a/app-accessibility/gok/gok-1.0.10.ebuild b/app-accessibility/gok/gok-1.0.10.ebuild
index a40644b80bab..2ff7a124723f 100644
--- a/app-accessibility/gok/gok-1.0.10.ebuild
+++ b/app-accessibility/gok/gok-1.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-1.0.10.ebuild,v 1.11 2007/07/11 02:34:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-1.0.10.ebuild,v 1.12 2007/07/22 08:28:50 omp Exp $
 
 inherit virtualx gnome2
 
@@ -24,24 +24,20 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	>=gnome-base/orbit-2
-	|| ( (
-			x11-libs/libXi
-			x11-libs/libX11
-			x11-libs/libSM
-			x11-libs/libICE )
-		virtual/x11 )"
+	x11-libs/libXi
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper
 	doc? ( >=dev-util/gtk-doc-1 )
-	|| ( (
-			x11-libs/libXt
-			x11-proto/inputproto
-			x11-proto/kbproto
-			x11-proto/xproto )
-		virtual/x11 )"
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/xproto"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/app-accessibility/gok/gok-1.2.0.ebuild b/app-accessibility/gok/gok-1.2.0.ebuild
index f9b2ac568344..76efea8299cc 100644
--- a/app-accessibility/gok/gok-1.2.0.ebuild
+++ b/app-accessibility/gok/gok-1.2.0.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-accessibility/gok/gok-1.2.0.ebuild,v 1.11 2007/07/11 02:34:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-1.2.0.ebuild,v 1.12 2007/07/22 08:28:50 omp Exp $
 
 inherit virtualx gnome2
 
@@ -25,24 +25,20 @@ RDEPEND=">=dev-libs/glib-2.11
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	>=gnome-base/orbit-2
-	|| ( (
-			x11-libs/libXi
-			x11-libs/libX11
-			x11-libs/libSM
-			x11-libs/libICE )
-		virtual/x11 )"
+	x11-libs/libXi
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper
 	doc? ( >=dev-util/gtk-doc-1 )
-	|| ( (
-			x11-libs/libXt
-			x11-proto/inputproto
-			x11-proto/kbproto
-			x11-proto/xproto )
-		virtual/x11 )"
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/xproto"
 
 DOCS="AUTHORS ChangeLog NEWS README"