Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

4 files changed, 22 insertions, 29 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 4b853f2de032..f4e96f4d1aba 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.92 2007/06/04 19:46:11 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.93 2007/07/22 02:58:03 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libxklavier-2.0-r1.ebuild, libxklavier-2.2.ebuild, libxklavier-3.1.ebuild:
+  Drop virtual/x11 references.
 
 *libxklavier-3.2 (04 Jun 2007)
 
diff --git a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild b/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
index 0d4869109d2d..fc78f905d77e 100644
--- a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.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/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.9 2006/09/04 07:15:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.10 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libxkbfile )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile
 	dev-libs/libxml2"
 
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-libs/libXt
-		x11-proto/xproto )
-	virtual/x11 )
+	x11-libs/libXt
+	x11-proto/xproto
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
diff --git a/x11-libs/libxklavier/libxklavier-2.2.ebuild b/x11-libs/libxklavier/libxklavier-2.2.ebuild
index c5288df65353..3c398cf864e6 100644
--- a/x11-libs/libxklavier/libxklavier-2.2.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.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/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.13 2006/10/20 15:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.14 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,12 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-		x11-apps/xkbcomp
-		x11-libs/libX11
-		x11-libs/libxkbfile )
-	virtual/x11 )
+RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/xkbcomp
+	x11-libs/libX11
+	x11-libs/libxkbfile
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/libxklavier/libxklavier-3.1.ebuild b/x11-libs/libxklavier/libxklavier-3.1.ebuild
index e7d77bd1d438..ed55f682e116 100644
--- a/x11-libs/libxklavier/libxklavier-3.1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-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/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.12 2007/05/28 00:06:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.13 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,15 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="||	(
-				(
-					||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
-					x11-apps/xkbcomp
-					x11-libs/libX11
-					x11-libs/libxkbfile
-				)
-				virtual/x11
-			)
+RDEPEND="||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
+		x11-apps/xkbcomp
+		x11-libs/libX11
+		x11-libs/libxkbfile
 		dev-libs/libxml2
 		>=dev-libs/glib-2.6"