21 files changed, 84 insertions, 100 deletions
diff --git a/dev-libs/9libs/9libs-1.0-r1.ebuild b/dev-libs/9libs/9libs-1.0-r1.ebuild
index 2c98a7b7ecd5..e39a303ea29e 100644
--- a/dev-libs/9libs/9libs-1.0-r1.ebuild
+++ b/dev-libs/9libs/9libs-1.0-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/dev-libs/9libs/9libs-1.0-r1.ebuild,v 1.2 2006/12/08 23:14:02 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/9libs-1.0-r1.ebuild,v 1.3 2007/07/22 08:35:34 graaff Exp $
 
 DESCRIPTION="A package of Plan 9 compatibility libraries"
 HOMEPAGE="http://www.netlib.org/research/9libs/9libs-1.0.README"
@@ -11,11 +11,9 @@ SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| (
-	( >=x11-proto/xproto-7.0.4
+DEPEND=" >=x11-proto/xproto-7.0.4
 	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0 )
-	virtual/x11 )"
+	>=x11-libs/libXt-1.0.0"
 
 RDEPEND="$DEPEND
 	!dev-libs/libevent"
diff --git a/dev-libs/9libs/9libs-1.0.ebuild b/dev-libs/9libs/9libs-1.0.ebuild
index 4944932fc7b4..e52b88412136 100644
--- a/dev-libs/9libs/9libs-1.0.ebuild
+++ b/dev-libs/9libs/9libs-1.0.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/dev-libs/9libs/9libs-1.0.ebuild,v 1.12 2006/08/27 22:26:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/9libs-1.0.ebuild,v 1.13 2007/07/22 08:35:34 graaff Exp $
 
 DESCRIPTION="A package of Plan 9 compatibility libraries"
 HOMEPAGE="http://www.netlib.org/research/9libs/9libs-1.0.README"
@@ -11,11 +11,9 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE=""
 
-DEPEND="|| (
-	( >=x11-proto/xproto-7.0.4
+DEPEND=">=x11-proto/xproto-7.0.4
 	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0 )
-	virtual/x11 )"
+	>=x11-libs/libXt-1.0.0"
 
 src_compile() {
 	econf \
diff --git a/dev-libs/9libs/ChangeLog b/dev-libs/9libs/ChangeLog
index 0a8cf3484a93..8fc7806e523e 100644
--- a/dev-libs/9libs/ChangeLog
+++ b/dev-libs/9libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/9libs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/ChangeLog,v 1.12 2007/05/14 20:18:59 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/ChangeLog,v 1.13 2007/07/22 08:35:34 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> 9libs-1.0.ebuild,
+  9libs-1.0-r1.ebuild:
+  Drop virtual/x11 references.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 6b3e328401dd..a55a30084e86 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/ace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.49 2007/07/12 22:10:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.50 2007/07/22 08:33:04 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> ace-5.5-r1.ebuild,
+  ace-5.5.8.ebuild, ace-5.5.9.ebuild:
+  Drop virtual/x11 references.
 
 *ace-5.5.9 (12 Jul 2007)
 
diff --git a/dev-libs/ace/ace-5.5-r1.ebuild b/dev-libs/ace/ace-5.5-r1.ebuild
index 70026f604c3a..be4920aac260 100644
--- a/dev-libs/ace/ace-5.5-r1.ebuild
+++ b/dev-libs/ace/ace-5.5-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/dev-libs/ace/ace-5.5-r1.ebuild,v 1.8 2007/07/12 02:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5-r1.ebuild,v 1.9 2007/07/22 08:33:04 graaff Exp $
 
 inherit eutils
 
@@ -19,17 +19,10 @@ IUSE="X ipv6 tao"
 DEPEND="dev-libs/openssl"
 
 RDEPEND="${DEPEND}
-	X? ( || (
-	( x11-libs/libXt
-	x11-libs/libXaw )
-	virtual/x11 )
-	)"
+	X? ( x11-libs/libXt x11-libs/libXaw )"
 
 DEPEND="${DEPEND}
-	X? ( || (
-	( x11-proto/xproto )
-	virtual/x11 )
-	)"
+	X? ( x11-proto/xproto )"
 
 src_compile() {
 	export ACE_ROOT="${S}"
diff --git a/dev-libs/ace/ace-5.5.8.ebuild b/dev-libs/ace/ace-5.5.8.ebuild
index 5124a6d43599..bc812dfe4bfd 100644
--- a/dev-libs/ace/ace-5.5.8.ebuild
+++ b/dev-libs/ace/ace-5.5.8.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/dev-libs/ace/ace-5.5.8.ebuild,v 1.4 2007/07/12 22:00:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5.8.ebuild,v 1.5 2007/07/22 08:33:04 graaff Exp $
 
 inherit toolchain-funcs
 
@@ -19,17 +19,10 @@ IUSE="X ipv6 tao ciao"
 COMMON_DEPEND="dev-libs/openssl"
 # TODO probably more
 RDEPEND="${COMMON_DEPEND}
-	X? ( || (
-	( x11-libs/libXt
-	x11-libs/libXaw )
-	virtual/x11 )
-	)"
+	X? ( x11-libs/libXt x11-libs/libXaw )"
 
 DEPEND="${COMMON_DEPEND}
-	X? ( || (
-	( x11-proto/xproto )
-	virtual/x11 )
-	)"
+	X? ( x11-proto/xproto )"
 
 S="${WORKDIR}/ACE_wrappers"
 
diff --git a/dev-libs/ace/ace-5.5.9.ebuild b/dev-libs/ace/ace-5.5.9.ebuild
index 8bd274933343..6ca840e58709 100644
--- a/dev-libs/ace/ace-5.5.9.ebuild
+++ b/dev-libs/ace/ace-5.5.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/dev-libs/ace/ace-5.5.9.ebuild,v 1.1 2007/07/12 22:10:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5.9.ebuild,v 1.2 2007/07/22 08:33:04 graaff Exp $
 
 inherit toolchain-funcs
 
@@ -19,17 +19,10 @@ IUSE="X ipv6 tao ciao"
 COMMON_DEPEND="dev-libs/openssl"
 # TODO probably more
 RDEPEND="${COMMON_DEPEND}
-	X? ( || (
-	( x11-libs/libXt
-	x11-libs/libXaw )
-	virtual/x11 )
-	)"
+	X? ( x11-libs/libXt x11-libs/libXaw )"
 
 DEPEND="${COMMON_DEPEND}
-	X? ( || (
-	( x11-proto/xproto )
-	virtual/x11 )
-	)"
+	X? ( x11-proto/xproto )"
 
 S="${WORKDIR}/ACE_wrappers"
 
diff --git a/dev-libs/libotf/ChangeLog b/dev-libs/libotf/ChangeLog
index 4a5efee87c6d..b1a67012bf41 100644
--- a/dev-libs/libotf/ChangeLog
+++ b/dev-libs/libotf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libotf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.24 2007/03/01 13:28:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.25 2007/07/22 08:28:47 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> libotf-0.9.4.ebuild:
+  Drop virtual/x11 references.
 
 *libotf-0.9.5 (01 Mar 2007)
 
diff --git a/dev-libs/libotf/libotf-0.9.4.ebuild b/dev-libs/libotf/libotf-0.9.4.ebuild
index 62fc4bffc558..948d772a75b1 100644
--- a/dev-libs/libotf/libotf-0.9.4.ebuild
+++ b/dev-libs/libotf/libotf-0.9.4.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/dev-libs/libotf/libotf-0.9.4.ebuild,v 1.1 2006/06/16 16:45:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.4.ebuild,v 1.2 2007/07/22 08:28:47 graaff Exp $
 
 DESCRIPTION="Library for handling OpenType fonts (OTF)"
 HOMEPAGE="http://www.m17n.org/libotf/"
@@ -11,10 +11,8 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ppc alpha amd64 ppc64 sparc hppa"
 IUSE="X"
-RDEPEND="|| ( ( x11-libs/libXaw
-				x11-libs/libICE
-			  )
-			  virtual/x11 )
+RDEPEND="x11-libs/libXaw
+	x11-libs/libICE
 	>=media-libs/freetype-2.1"
 
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libstroke/ChangeLog b/dev-libs/libstroke/ChangeLog
index ed0979ac83c1..b925f1fa84d9 100644
--- a/dev-libs/libstroke/ChangeLog
+++ b/dev-libs/libstroke/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libstroke
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.21 2007/03/18 23:59:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.22 2007/07/22 08:26:57 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> libstroke-0.5.1.ebuild:
+  Drop virtual/x11 references.
 
   18 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove plasmaroo from metadata.xml due to retirement.
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild
index e8ebcab401d6..4e07bf130518 100644
--- a/dev-libs/libstroke/libstroke-0.5.1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.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/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.19 2007/03/18 10:16:04 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.20 2007/07/22 08:26:57 graaff Exp $
 
 WANT_AUTOCONF=1.9
 WANT_AUTOMAKE=1.4
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="|| ( ( x11-proto/xproto x11-libs/libX11 ) virtual/x11 )"
+DEPEND="x11-proto/xproto
+	x11-libs/libX11"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index d4932c045151..3ac6d5173883 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/m17n-lib
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.33 2007/02/04 05:40:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.34 2007/07/22 08:25:23 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> m17n-lib-1.2.0.ebuild,
+  m17n-lib-1.3.3.ebuild, m17n-lib-1.3.4.ebuild:
+  Drop virtual/x11 references.
 
   04 Feb 2007; Steve Dibb <beandog@gentoo.org> m17n-lib-1.3.3.ebuild:
   amd64 stable, bug 156872
diff --git a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
index 6f4eea414eae..47ef9398430f 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.2.0.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/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild,v 1.8 2006/10/15 20:04:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild,v 1.9 2007/07/22 08:25:23 graaff Exp $
 
 inherit eutils
 
@@ -14,14 +14,10 @@ SLOT="0"
 KEYWORDS="x86 alpha ppc amd64 ppc64 sparc hppa"
 IUSE=""
 
-DEPEND="|| ( (
-		       x11-libs/libXaw
-			   x11-libs/libICE
-			   x11-libs/libXrender
-			   x11-libs/libXft
-			 )
-			 virtual/x11
-		   )
+DEPEND="x11-libs/libXaw
+	x11-libs/libICE
+	x11-libs/libXrender
+	x11-libs/libXft
 	dev-libs/libxml2
 	dev-libs/fribidi
 	>=media-libs/freetype-2.1
diff --git a/dev-libs/m17n-lib/m17n-lib-1.3.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.3.3.ebuild
index d93161e8968c..cfd4020966da 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.3.3.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.3.3.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/dev-libs/m17n-lib/m17n-lib-1.3.3.ebuild,v 1.9 2007/02/04 05:40:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.3.3.ebuild,v 1.10 2007/07/22 08:25:23 graaff Exp $
 
 inherit flag-o-matic
 
@@ -14,14 +14,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="|| ( (
-			x11-libs/libXaw
-			x11-libs/libICE
-			x11-libs/libXrender
-			x11-libs/libXft
-		)
-		virtual/x11
-	)
+DEPEND="x11-libs/libXaw
+	x11-libs/libICE
+	x11-libs/libXrender
+	x11-libs/libXft
 	dev-libs/libxml2
 	dev-libs/fribidi
 	>=media-libs/freetype-2.1
diff --git a/dev-libs/m17n-lib/m17n-lib-1.3.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.3.4.ebuild
index ccbce5d390a5..c1aea12871cd 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.3.4.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.3.4.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/dev-libs/m17n-lib/m17n-lib-1.3.4.ebuild,v 1.1 2006/12/24 05:32:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.3.4.ebuild,v 1.2 2007/07/22 08:25:23 graaff Exp $
 
 inherit flag-o-matic
 
@@ -14,14 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gd"
 
-DEPEND="|| ( (
-			x11-libs/libXaw
-			x11-libs/libICE
-			x11-libs/libXrender
-			x11-libs/libXft
-		)
-		virtual/x11
-	)
+DEPEND="x11-libs/libXaw
+	x11-libs/libICE
+	x11-libs/libXrender
+	x11-libs/libXft
 	dev-libs/libxml2
 	dev-libs/fribidi
 	>=media-libs/freetype-2.1
diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 50568a9969d7..be2e06c3bcd5 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.39 2007/07/20 12:48:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.40 2007/07/22 08:22:44 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> opensc-0.9.4.ebuild,
+  opensc-0.10.1.ebuild, opensc-0.11.0-r1.ebuild:
+  Drop virtual/x11 references.
 
 *opensc-0.11.3 (20 Jul 2007)
 
diff --git a/dev-libs/opensc/opensc-0.10.1.ebuild b/dev-libs/opensc/opensc-0.10.1.ebuild
index b328d093f00d..2a7f56ef865b 100644
--- a/dev-libs/opensc/opensc-0.10.1.ebuild
+++ b/dev-libs/opensc/opensc-0.10.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/dev-libs/opensc/opensc-0.10.1.ebuild,v 1.13 2007/02/27 23:35:54 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.10.1.ebuild,v 1.14 2007/07/22 08:22:44 graaff Exp $
 
 inherit eutils libtool
 
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="ldap pcsc-lite X"
 #pam
 
-RDEPEND="X? ( || ( ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 ) virtual/x11 ) )
+RDEPEND="X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 )
 	ldap? ( net-nds/openldap )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	!pcsc-lite? ( >=dev-libs/openct-0.5.0 )"
diff --git a/dev-libs/opensc/opensc-0.11.0-r1.ebuild b/dev-libs/opensc/opensc-0.11.0-r1.ebuild
index b3650b983f3c..3f9b7e5f755d 100644
--- a/dev-libs/opensc/opensc-0.11.0-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.11.0-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/dev-libs/opensc/opensc-0.11.0-r1.ebuild,v 1.2 2007/02/27 23:35:54 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.0-r1.ebuild,v 1.3 2007/07/22 08:22:44 graaff Exp $
 
 inherit eutils libtool
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="ldap pcsc-lite X"
 #pam
 
-RDEPEND="X? ( || ( ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 ) virtual/x11 ) )
+RDEPEND="X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 )
 	ldap? ( net-nds/openldap )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	!pcsc-lite? ( >=dev-libs/openct-0.5.0 )"
diff --git a/dev-libs/opensc/opensc-0.9.4.ebuild b/dev-libs/opensc/opensc-0.9.4.ebuild
index e86ecc39ca6e..45f0f7680510 100644
--- a/dev-libs/opensc/opensc-0.9.4.ebuild
+++ b/dev-libs/opensc/opensc-0.9.4.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/dev-libs/opensc/opensc-0.9.4.ebuild,v 1.11 2007/07/12 02:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.9.4.ebuild,v 1.12 2007/07/22 08:22:44 graaff Exp $
 
 inherit eutils libtool
 
@@ -16,7 +16,7 @@ IUSE="ldap pam pcsc-lite X"
 RDEPEND="ldap? ( net-nds/openldap )
 	pam? ( >=sys-libs/pam-0.77
 		>=sys-apps/shadow-4.0.3 )
-	X? ( || ( ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 ) virtual/x11 ) )
+	X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	!pcsc-lite? ( >=dev-libs/openct-0.5.0 )"
 
diff --git a/dev-libs/wnn7sdk/ChangeLog b/dev-libs/wnn7sdk/ChangeLog
index 6a45687acd1f..6cf9be401c4f 100644
--- a/dev-libs/wnn7sdk/ChangeLog
+++ b/dev-libs/wnn7sdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/wnn7sdk
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.4 2006/12/30 12:59:46 usata Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.5 2007/07/22 08:17:47 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> wnn7sdk-20011017.ebuild:
+  Drop virtual/x11 references.
 
   30 Dec 2006; Mamoru KOMACHI <usata@gentoo.org> wnn7sdk-20011017.ebuild:
   Added to ~amd64.
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
index 3ef3ccd1a161..f5f84a22c0bb 100644
--- a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017.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/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.4 2006/12/30 12:59:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.5 2007/07/22 08:17:47 graaff Exp $
 
 inherit eutils
 
@@ -15,10 +15,7 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 # x11 is required for imake
-DEPEND="|| (
-			x11-misc/imake
-			virtual/x11
-	)"
+DEPEND="x11-misc/imake"
 RDEPEND=""
 
 S="${WORKDIR}/src"