Drop virtual/x11 dependency.

Package-Manager: portage-2.1.3_rc8

19 files changed, 109 insertions, 117 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 42e8a034fe12..9b32b67ae2ed 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.28 2007/06/24 15:55:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.29 2007/07/22 09:41:19 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> uim-svn-1.5.ebuild:
+  Drop virtual/x11 dependency.
 
   24 Jun 2007; MATSUU Takuto <matsuu@gentoo.org> uim-svn-1.5.ebuild:
   Fixed to use the right condition for calling elisp-site-regen, bug #182639.
diff --git a/app-i18n/uim-svn/uim-svn-1.5.ebuild b/app-i18n/uim-svn/uim-svn-1.5.ebuild
index 9468d7ad9aab..2ee9cf34cb8b 100644
--- a/app-i18n/uim-svn/uim-svn-1.5.ebuild
+++ b/app-i18n/uim-svn/uim-svn-1.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-i18n/uim-svn/uim-svn-1.5.ebuild,v 1.2 2007/06/24 15:55:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-1.5.ebuild,v 1.3 2007/07/22 09:41:19 calchan Exp $
 
 inherit elisp-common flag-o-matic kde-functions multilib subversion
 
@@ -23,23 +23,17 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-lang/ruby
 	app-text/asciidoc
-	X? ( || ( (
-				x11-proto/xextproto
-				x11-proto/xproto
-			  )
-	   	 	  virtual/x11 ) )
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )
 	nls? ( virtual/libintl )"
 RDEPEND="!app-i18n/uim
-	X? ( || ( (
-	   	 	    x11-libs/libX11
-				x11-libs/libXft
-				x11-libs/libXt
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXext
-				x11-libs/libXrender
-			  )
-		   	  virtual/x11 ) )
+	X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -176,4 +170,4 @@ pkg_postrm() {
 
 }
 
-# $Id: uim-svn-1.5.ebuild,v 1.2 2007/06/24 15:55:33 matsuu Exp $
+# $Id: uim-svn-1.5.ebuild,v 1.3 2007/07/22 09:41:19 calchan Exp $
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 1a4a4c378ac5..862dfcb8d93a 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.165 2007/07/18 17:24:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.166 2007/07/22 09:38:03 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> uim-1.2.1.ebuild,
+  uim-1.3.1.ebuild, uim-1.4.0.ebuild, uim-1.4.1.ebuild:
+  Drop virtual/x11 dependency.
 
   18 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> uim-1.4.1.ebuild:
   Stable on sparc wrt #184462
diff --git a/app-i18n/uim/uim-1.2.1.ebuild b/app-i18n/uim/uim-1.2.1.ebuild
index c08ae48e440e..a009a8ef7d3f 100644
--- a/app-i18n/uim/uim-1.2.1.ebuild
+++ b/app-i18n/uim/uim-1.2.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-i18n/uim/uim-1.2.1.ebuild,v 1.17 2007/02/04 05:46:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.2.1.ebuild,v 1.18 2007/07/22 09:38:03 calchan Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -16,16 +16,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib nls prime qt3 X"
 
-RDEPEND="X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXext
-			x11-libs/libXrender
-		)
-		<virtual/x11-7 ) )
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -42,11 +39,8 @@ RDEPEND="X? ( || ( (
 	!<app-i18n/prime-0.9.4"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-		)
-		<virtual/x11-7 ) )"
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
 
 pkg_setup() {
 	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
diff --git a/app-i18n/uim/uim-1.3.1.ebuild b/app-i18n/uim/uim-1.3.1.ebuild
index 4fe40b2a0534..9f29fd5f8de6 100644
--- a/app-i18n/uim/uim-1.3.1.ebuild
+++ b/app-i18n/uim/uim-1.3.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-i18n/uim/uim-1.3.1.ebuild,v 1.3 2007/02/01 14:55:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.3.1.ebuild,v 1.4 2007/07/22 09:38:03 calchan Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -13,16 +13,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 X"
 
-RDEPEND="X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXext
-			x11-libs/libXrender
-		)
-		<virtual/x11-7 ) )
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -40,11 +37,8 @@ RDEPEND="X? ( || ( (
 	!<app-i18n/prime-0.9.4"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-		)
-		<virtual/x11-7 ) )"
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
 
 pkg_setup() {
 	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
diff --git a/app-i18n/uim/uim-1.4.0.ebuild b/app-i18n/uim/uim-1.4.0.ebuild
index ad0022daca2f..17f99d7633be 100644
--- a/app-i18n/uim/uim-1.4.0.ebuild
+++ b/app-i18n/uim/uim-1.4.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-i18n/uim/uim-1.4.0.ebuild,v 1.2 2007/04/03 14:24:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.0.ebuild,v 1.3 2007/07/22 09:38:03 calchan Exp $
 
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
@@ -13,16 +13,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 X"
 
-RDEPEND="X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXext
-			x11-libs/libXrender
-		)
-		<virtual/x11-7 ) )
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -40,11 +37,8 @@ RDEPEND="X? ( || ( (
 	!<app-i18n/prime-0.9.4"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-		)
-		<virtual/x11-7 ) )"
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
 
 pkg_setup() {
 	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
diff --git a/app-i18n/uim/uim-1.4.1.ebuild b/app-i18n/uim/uim-1.4.1.ebuild
index f7f5db32feaa..26dc1ceb73ff 100644
--- a/app-i18n/uim/uim-1.4.1.ebuild
+++ b/app-i18n/uim/uim-1.4.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-i18n/uim/uim-1.4.1.ebuild,v 1.8 2007/07/18 17:24:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.9 2007/07/22 09:38:03 calchan Exp $
 
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
@@ -13,15 +13,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 hppa ppc ppc64 sparc x86"
 IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
 
-RDEPEND="X? (
-		x11-libs/libX11
+RDEPEND="X? ( x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXt
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libXext
-		x11-libs/libXrender
-	)
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -39,10 +37,8 @@ RDEPEND="X? (
 	!<app-i18n/prime-0.9.4"
 
 DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
 
 RDEPEND="${RDEPEND}
 	X? (
diff --git a/app-i18n/unicon/ChangeLog b/app-i18n/unicon/ChangeLog
index b669aea82e0f..2052399eb873 100644
--- a/app-i18n/unicon/ChangeLog
+++ b/app-i18n/unicon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/unicon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/ChangeLog,v 1.10 2007/02/21 22:14:36 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/ChangeLog,v 1.11 2007/07/22 09:43:52 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> unicon-3.0.4-r1.ebuild,
+  unicon-3.0.4-r2.ebuild:
+  Drop virtual/x11 dependency.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-i18n/unicon/unicon-3.0.4-r1.ebuild b/app-i18n/unicon/unicon-3.0.4-r1.ebuild
index 6942129f7a7b..31d05207d5fb 100644
--- a/app-i18n/unicon/unicon-3.0.4-r1.ebuild
+++ b/app-i18n/unicon/unicon-3.0.4-r1.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-i18n/unicon/unicon-3.0.4-r1.ebuild,v 1.3 2006/02/13 02:48:54 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/unicon-3.0.4-r1.ebuild,v 1.4 2007/07/22 09:43:52 calchan Exp $
 
 inherit eutils
 
@@ -23,10 +23,10 @@ IUSE=""
 RDEPEND="virtual/linux-sources
 	dev-libs/newt
 	dev-libs/pth
-	|| ( x11-libs/libX11 virtual/x11 )"
+	x11-libs/libX11"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${VD_P}.tar.gz
diff --git a/app-i18n/unicon/unicon-3.0.4-r2.ebuild b/app-i18n/unicon/unicon-3.0.4-r2.ebuild
index 04cd212c6b64..25496e2e44ba 100644
--- a/app-i18n/unicon/unicon-3.0.4-r2.ebuild
+++ b/app-i18n/unicon/unicon-3.0.4-r2.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-i18n/unicon/unicon-3.0.4-r2.ebuild,v 1.2 2006/02/13 02:48:54 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicon/unicon-3.0.4-r2.ebuild,v 1.3 2007/07/22 09:43:52 calchan Exp $
 
 inherit eutils
 
@@ -21,10 +21,10 @@ IUSE=""
 RDEPEND="virtual/linux-sources
 	dev-libs/newt
 	dev-libs/pth
-	|| ( x11-libs/libX11 virtual/x11 )"
+	x11-libs/libX11"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 S=${WORKDIR}/${P}.orig
 
diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index 94724682cd5b..727a57f4a053 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/x-unikey
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.17 2007/04/09 12:33:06 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.18 2007/07/22 09:48:19 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> x-unikey-0.9.2.ebuild,
+  x-unikey-1.0.ebuild, x-unikey-1.0.2.ebuild, x-unikey-1.0.4.ebuild:
+  Drop virtual/x11 dependency.
 
   09 Apr 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
   x-unikey-0.9.2.ebuild, x-unikey-1.0.ebuild, x-unikey-1.0.2.ebuild,
diff --git a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
index bd6b451d7c1f..b35f061f142e 100644
--- a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-0.9.2.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-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.7 2007/04/09 12:33:06 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.8 2007/07/22 09:48:19 calchan Exp $
 
 inherit eutils
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="nls gtk"
 
-DEPEND="|| ( ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		     virtual/x11 )
+DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	nls? ( sys-devel/gettext )
 	gtk? ( >=x11-libs/gtk+-2.2 )"
 
diff --git a/app-i18n/x-unikey/x-unikey-1.0.2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.2.ebuild
index 16d64f6f2d25..a14d69baaaed 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.2.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-i18n/x-unikey/x-unikey-1.0.2.ebuild,v 1.5 2007/04/09 12:33:06 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.2.ebuild,v 1.6 2007/07/22 09:48:19 calchan Exp $
 
 inherit eutils
 
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="nls gtk doc"
 
-DEPEND="|| ( ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		     virtual/x11 )
+DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	nls? ( sys-devel/gettext )
 	gtk? ( >=x11-libs/gtk+-2.2 )"
 
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4.ebuild
index e207ca4a4b2c..282ea4db5d15 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.4.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.4.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-i18n/x-unikey/x-unikey-1.0.4.ebuild,v 1.3 2007/04/09 12:33:06 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4.ebuild,v 1.4 2007/07/22 09:48:19 calchan Exp $
 
 inherit eutils
 
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="nls gtk doc"
 
-DEPEND="|| ( ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		     virtual/x11 )
+DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	nls? ( sys-devel/gettext )
 	gtk? ( >=x11-libs/gtk+-2.2 )"
 
diff --git a/app-i18n/x-unikey/x-unikey-1.0.ebuild b/app-i18n/x-unikey/x-unikey-1.0.ebuild
index 1d2c4ad34225..fcfb34de2716 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.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-i18n/x-unikey/x-unikey-1.0.ebuild,v 1.4 2007/04/09 12:33:06 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.ebuild,v 1.5 2007/07/22 09:48:19 calchan Exp $
 
 inherit eutils
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="nls gtk"
 
-DEPEND="|| ( ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		     virtual/x11 )
+DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	nls? ( sys-devel/gettext )
 	gtk? ( >=x11-libs/gtk+-2.2 )"
 
diff --git a/app-i18n/xvnkb/ChangeLog b/app-i18n/xvnkb/ChangeLog
index 92b3ff1da511..bc8620b9a856 100644
--- a/app-i18n/xvnkb/ChangeLog
+++ b/app-i18n/xvnkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/xvnkb
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.15 2007/01/05 16:37:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.16 2007/07/22 09:53:17 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> xvnkb-0.2.8a-r1.ebuild,
+  xvnkb-0.2.9.ebuild, xvnkb-0.2.9a.ebuild:
+  Drop virtual/x11 dependency.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> xvnkb-0.2.8a-r1.ebuild,
   xvnkb-0.2.9.ebuild, xvnkb-0.2.9a.ebuild:
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
index ee76700e1e0a..6f0edfc20e03 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-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-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild,v 1.4 2007/01/05 16:37:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild,v 1.5 2007/07/22 09:53:17 calchan Exp $
 
 inherit eutils
 
@@ -14,11 +14,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="x86 ppc"
-RDEPEND="|| ( ( x11-libs/libX11
-				truetype? ( virtual/xft )
-				)
-			virtual/x11 )"
-DEPEND="${RDEPEND} || ( ( x11-proto/xproto ) virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	truetype? ( virtual/xft )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9.ebuild
index 4532706b7d52..ebe4d92f68c3 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9.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-i18n/xvnkb/xvnkb-0.2.9.ebuild,v 1.4 2007/01/05 16:37:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9.ebuild,v 1.5 2007/07/22 09:53:17 calchan Exp $
 
 inherit eutils
 
@@ -14,11 +14,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-RDEPEND="|| ( ( x11-libs/libX11
-				truetype? ( virtual/xft )
-				)
-			virtual/x11 )"
-DEPEND="${RDEPEND} || ( ( x11-proto/xproto ) virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	truetype? ( virtual/xft )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
 
 src_compile() {
 	local myconf
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild
index 344eb2239ede..c96be281c991 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a.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-i18n/xvnkb/xvnkb-0.2.9a.ebuild,v 1.3 2007/01/05 16:37:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a.ebuild,v 1.4 2007/07/22 09:53:17 calchan Exp $
 
 inherit eutils
 
@@ -14,11 +14,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86"
-RDEPEND="|| ( ( x11-libs/libX11
-				truetype? ( virtual/xft )
-				)
-			virtual/x11 )"
-DEPEND="${RDEPEND} || ( ( x11-proto/xproto ) virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	truetype? ( virtual/xft )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
 
 src_compile() {
 	local myconf