Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

27 files changed, 131 insertions, 126 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 6c1c5f289965..9f943ed35fc4 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.265 2007/07/08 10:27:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.266 2007/07/22 10:50:48 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kdenetwork-3.5.5-r1.ebuild,
+  kdenetwork-3.5.5-r2.ebuild:
+  Remove virtual/x11 from dependencies.
 
   08 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/kopete-3.5.5-enable-final-redefines.patch,
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
index 16278bf30d18..330991817872 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.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/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.17 2007/07/08 10:27:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.18 2007/07/22 10:50:48 omp Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -21,12 +21,10 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	sametime? ( =net-libs/meanwhile-1.0* )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -37,12 +35,10 @@ RDEPEND="${BOTH_DEPEND}
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			x11-proto/xproto
-			kernel_linux? ( x11-libs/libXv )
-			x11-proto/scrnsaverproto
-		) <virtual/x11-7 )
+	x11-proto/videoproto
+	x11-proto/xproto
+	kernel_linux? ( x11-libs/libXv )
+	x11-proto/scrnsaverproto
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
index a3cb2fed49fa..811f459fa8aa 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.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/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.13 2007/07/08 10:27:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.14 2007/07/22 10:50:48 omp Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -21,12 +21,10 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	sametime? ( =net-libs/meanwhile-1.0* )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -37,12 +35,10 @@ RDEPEND="${BOTH_DEPEND}
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			x11-proto/xproto
-			kernel_linux? ( x11-libs/libXv )
-			x11-proto/scrnsaverproto
-		) <virtual/x11-7 )
+	x11-proto/videoproto
+	x11-proto/xproto
+	kernel_linux? ( x11-libs/libXv )
+	x11-proto/scrnsaverproto
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index dccbe95e7dff..d0fed278721a 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.92 2007/05/23 10:30:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.93 2007/07/22 10:47:47 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kdesktop-3.5.5.ebuild,
+  kdesktop-3.5.5-r1.ebuild, kdesktop-3.5.6.ebuild, kdesktop-3.5.6-r1.ebuild:
+  Remove virtual/x11 from dependencies.
 
   23 May 2007; Carsten Lohrke <carlo@gentoo.org> kdesktop-3.5.7.ebuild:
   Correct dependencies.
diff --git a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
index e98e6cd8afef..4b8b7c8397f6 100644
--- a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.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/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild,v 1.11 2007/04/21 20:50:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild,v 1.12 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.5.ebuild b/kde-base/kdesktop/kdesktop-3.5.5.ebuild
index f2fc85cd74fa..e4273038171f 100644
--- a/kde-base/kdesktop/kdesktop-3.5.5.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.5.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/kde-base/kdesktop/kdesktop-3.5.5.ebuild,v 1.9 2006/12/11 14:12:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.5.ebuild,v 1.10 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
index 6f6b0f7480b2..5e7ed78863fe 100644
--- a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.6-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/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.1 2007/04/15 22:46:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.2 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
 	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.6.ebuild b/kde-base/kdesktop/kdesktop-3.5.6.ebuild
index eb670b552131..41838f5bae4e 100644
--- a/kde-base/kdesktop/kdesktop-3.5.6.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.6.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/kde-base/kdesktop/kdesktop-3.5.6.ebuild,v 1.2 2007/01/18 00:25:18 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6.ebuild,v 1.3 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
 	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 3310e6f9c21d..6f9454d464b9 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.204 2007/06/25 06:04:58 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.205 2007/07/22 10:45:03 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kdeutils-3.5.5.ebuild:
+  Remove virtual/x11 from dependencies.
 
   25 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/superkaramba-3.5.7-network_sensor.patch, kdeutils-3.5.7.ebuild:
diff --git a/kde-base/kdeutils/kdeutils-3.5.5.ebuild b/kde-base/kdeutils/kdeutils-3.5.5.ebuild
index 254fdf875a97..5b12ea522589 100644
--- a/kde-base/kdeutils/kdeutils-3.5.5.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.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/kde-base/kdeutils/kdeutils-3.5.5.ebuild,v 1.13 2007/07/11 01:08:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.5.ebuild,v 1.14 2007/07/22 10:45:03 omp Exp $
 
 inherit kde-dist eutils
 
@@ -17,17 +17,15 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	pbbuttonsd? ( app-laptop/pbbuttonsd )
 	dev-lang/python
 	dev-libs/gmp
-	|| ( x11-libs/libXtst <virtual/x11-7 )"
+	x11-libs/libXtst"
 
 RDEPEND="${BOTH_DEPEND}
 	crypt? ( app-crypt/gnupg )
 	!x11-misc/superkaramba"
 
 DEPEND="${BOTH_DEPEND}
-	|| ( (
-			x11-libs/libX11
-			x11-proto/xproto
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-proto/xproto
 	virtual/os-headers"
 
 src_unpack() {
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 88fa86e4f678..1e68c969f1e5 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.92 2007/05/22 23:33:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.93 2007/07/22 10:42:14 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kdm-3.5.5-r1.ebuild,
+  kdm-3.5.6.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *kdm-3.5.7 (22 May 2007)
 
diff --git a/kde-base/kdm/kdm-3.5.5-r1.ebuild b/kde-base/kdm/kdm-3.5.5-r1.ebuild
index 44526d40b6f2..4b9f2cc9a6a5 100644
--- a/kde-base/kdm/kdm-3.5.5-r1.ebuild
+++ b/kde-base/kdm/kdm-3.5.5-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/kde-base/kdm/kdm-3.5.5-r1.ebuild,v 1.9 2006/12/11 14:13:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.5-r1.ebuild,v 1.10 2007/07/22 10:42:14 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -24,8 +24,8 @@ DEPEND="pam? ( kde-base/kdebase-pam )
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm kcontrol modules
 RDEPEND="${DEPEND}
-	|| ( (	x11-apps/xinit x11-apps/xmessage )
-		<virtual/x11-7 )
+	x11-apps/xinit
+	x11-apps/xmessage
 	kde-base/kdepasswd"
 PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
 
diff --git a/kde-base/kdm/kdm-3.5.6.ebuild b/kde-base/kdm/kdm-3.5.6.ebuild
index 4617b397a60b..8b8ada1f9d10 100644
--- a/kde-base/kdm/kdm-3.5.6.ebuild
+++ b/kde-base/kdm/kdm-3.5.6.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/kde-base/kdm/kdm-3.5.6.ebuild,v 1.2 2007/01/17 17:16:11 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.6.ebuild,v 1.3 2007/07/22 10:42:14 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -24,8 +24,8 @@ DEPEND="pam? ( kde-base/kdebase-pam )
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm kcontrol modules
 RDEPEND="${DEPEND}
-	|| ( (	x11-apps/xinit x11-apps/xmessage )
-		<virtual/x11-7 )
+	x11-apps/xinit
+	x11-apps/xmessage
 	kde-base/kdepasswd"
 PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
 
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index 82262cd5c995..f6e58474399d 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.79 2007/05/28 20:07:33 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.80 2007/07/22 10:40:26 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> klaptopdaemon-3.5.5.ebuild:
+  Remove virtual/x11 from dependencies.
 
   28 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/klaptopdaemon-3.5.7-libXss-linking.patch,
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.5.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.5.ebuild
index eb90c5920689..19e7748d6662 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.5.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.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/kde-base/klaptopdaemon/klaptopdaemon-3.5.5.ebuild,v 1.11 2007/05/18 19:18:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.5.ebuild,v 1.12 2007/07/22 10:40:26 omp Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -16,11 +16,9 @@ IUSE="kdehiddenvisibility"
 
 RESTRICT="strip"
 
-RDEPEND="|| ( x11-libs/libXtst <virtual/x11-7 )"
+RDEPEND="x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-libs/libX11
-			x11-proto/xproto
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-proto/xproto
 	virtual/os-headers"
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index f26229236df2..569e83ca8bd1 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.76 2007/05/23 00:47:38 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.77 2007/07/22 10:38:49 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> konsole-3.5.5.ebuild,
+  konsole-3.5.6.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *konsole-3.5.7 (23 May 2007)
 
diff --git a/kde-base/konsole/konsole-3.5.5.ebuild b/kde-base/konsole/konsole-3.5.5.ebuild
index e1a81c3e8db3..2d028cba9499 100644
--- a/kde-base/konsole/konsole-3.5.5.ebuild
+++ b/kde-base/konsole/konsole-3.5.5.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/kde-base/konsole/konsole-3.5.5.ebuild,v 1.10 2006/12/11 11:55:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.5.ebuild,v 1.11 2007/07/22 10:38:49 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -14,16 +14,13 @@ DESCRIPTION="X terminal for use with KDE."
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-RDEPEND="
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			x11-libs/libXtst
-		) <virtual/x11-7 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
-	|| ( x11-apps/bdftopcf <virtual/x11-7 )"
+	x11-apps/bdftopcf"
 
 # For kcm_konsole module
 RDEPEND="${RDEPEND}
diff --git a/kde-base/konsole/konsole-3.5.6.ebuild b/kde-base/konsole/konsole-3.5.6.ebuild
index 37884a611145..8be246a92a26 100644
--- a/kde-base/konsole/konsole-3.5.6.ebuild
+++ b/kde-base/konsole/konsole-3.5.6.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/kde-base/konsole/konsole-3.5.6.ebuild,v 1.1 2007/01/16 21:01:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.6.ebuild,v 1.2 2007/07/22 10:38:49 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -14,16 +14,13 @@ DESCRIPTION="X terminal for use with KDE."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-RDEPEND="
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			x11-libs/libXtst
-		) <virtual/x11-7 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
-	|| ( x11-apps/bdftopcf <virtual/x11-7 )"
+	x11-apps/bdftopcf"
 
 # For kcm_konsole module
 RDEPEND="${RDEPEND}
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 41d2445d6c93..62e492baa171 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.115 2007/07/07 23:52:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.116 2007/07/22 10:36:52 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kopete-3.5.5-r2.ebuild:
+  Remove virtual/x11 from dependencies.
 
   07 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/kopete-3.5.5-enable-final-redefines.patch,
diff --git a/kde-base/kopete/kopete-3.5.5-r2.ebuild b/kde-base/kopete/kopete-3.5.5-r2.ebuild
index 0ce08940abd9..69c82e8841fd 100644
--- a/kde-base/kopete/kopete-3.5.5-r2.ebuild
+++ b/kde-base/kopete/kopete-3.5.5-r2.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/kde-base/kopete/kopete-3.5.5-r2.ebuild,v 1.15 2007/07/07 23:52:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.5-r2.ebuild,v 1.16 2007/07/22 10:36:52 omp Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -26,17 +26,15 @@ BOTH_DEPEND="dev-libs/libxslt
 	net-dns/libidn
 	>=dev-libs/glib-2
 	app-crypt/qca
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
 	sametime? ( =net-libs/meanwhile-1.0* )
 	jingle? (
 		>=media-libs/speex-1.1.6
 		dev-libs/expat
 		~net-libs/ortp-0.7.1 )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		) <virtual/x11-7 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
 	kernel_linux? ( virtual/opengl )
 	sms? ( app-mobilephone/gsmlib )"
 
@@ -52,11 +50,9 @@ RDEPEND="${BOTH_DEPEND}
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			kernel_linux? ( x11-libs/libXv )
-			xscreensaver? ( x11-proto/scrnsaverproto )
-		) <virtual/x11-7 )"
+	x11-proto/videoproto
+	kernel_linux? ( x11-libs/libXv )
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog
index a8d57d6ccc06..ab61129329d1 100644
--- a/kde-base/ksplashml/ChangeLog
+++ b/kde-base/ksplashml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksplashml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.71 2007/05/23 01:34:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.72 2007/07/22 10:34:35 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> ksplashml-3.5.5.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *ksplashml-3.5.7 (23 May 2007)
 
diff --git a/kde-base/ksplashml/ksplashml-3.5.5.ebuild b/kde-base/ksplashml/ksplashml-3.5.5.ebuild
index cced6cc9d74a..e5f89f12d48c 100644
--- a/kde-base/ksplashml/ksplashml-3.5.5.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.5.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/kde-base/ksplashml/ksplashml-3.5.5.ebuild,v 1.9 2006/12/11 11:59:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.5.ebuild,v 1.10 2007/07/22 10:34:35 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,10 +11,10 @@ DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xinerama"
 
-RDEPEND="xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
+RDEPEND="xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )"
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	myconf="${myconf} $(use_with xinerama)"
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 8d91e1892f57..0999acc1e9d5 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.82 2007/05/23 02:10:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.83 2007/07/22 10:32:29 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kxkb-3.5.5.ebuild,
+  kxkb-3.5.6.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *kxkb-3.5.7 (23 May 2007)
 
diff --git a/kde-base/kxkb/kxkb-3.5.5.ebuild b/kde-base/kxkb/kxkb-3.5.5.ebuild
index 9f5056a7bd62..f5cb6f69923a 100644
--- a/kde-base/kxkb/kxkb-3.5.5.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.5.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/kde-base/kxkb/kxkb-3.5.5.ebuild,v 1.10 2007/07/11 01:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.5.ebuild,v 1.11 2007/07/22 10:32:29 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -15,10 +15,8 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
 RDEPEND="${RDEPEND}
-	|| ( (
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) <virtual/x11-7 )"
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap"
 
 KMEXTRACTONLY="${KMEXTRACTONLY}
 	kdm/configure.in.in"
diff --git a/kde-base/kxkb/kxkb-3.5.6.ebuild b/kde-base/kxkb/kxkb-3.5.6.ebuild
index de3b9b7f1b66..f5f8dfbfbf70 100644
--- a/kde-base/kxkb/kxkb-3.5.6.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.6.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/kde-base/kxkb/kxkb-3.5.6.ebuild,v 1.2 2007/07/11 01:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.6.ebuild,v 1.3 2007/07/22 10:32:29 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -15,10 +15,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
 RDEPEND="${RDEPEND}
-	|| ( (
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) <virtual/x11-7 )"
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap"
 
 KMEXTRACTONLY="${KMEXTRACTONLY}
 	kdm/configure.in.in"
diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog
index b73e32706819..64ba35698aa4 100644
--- a/kde-base/mpeglib/ChangeLog
+++ b/kde-base/mpeglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/mpeglib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.47 2007/05/24 11:25:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.48 2007/07/22 10:30:30 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> mpeglib-3.5.1.ebuild:
+  Remove virtual/x11 from dependencies.
 
   24 May 2007; Carsten Lohrke <carlo@gentoo.org> mpeglib-3.5.6.ebuild:
   Adjust MAXKDEVER.
diff --git a/kde-base/mpeglib/mpeglib-3.5.1.ebuild b/kde-base/mpeglib/mpeglib-3.5.1.ebuild
index 6fd5c6333336..80af5d3f660d 100644
--- a/kde-base/mpeglib/mpeglib-3.5.1.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.5.1.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/kde-base/mpeglib/mpeglib-3.5.1.ebuild,v 1.14 2006/10/03 13:09:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.1.ebuild,v 1.15 2007/07/22 10:30:30 omp Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=3.5.5
@@ -11,19 +11,15 @@ DESCRIPTION="KDE mpeg library"
 KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 RDEPEND="media-sound/cdparanoia
-	|| ( (
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm
-		) <virtual/x11-7 )
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
 	media-libs/libvorbis"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-proto/xf86dgaproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/videoproto
-		) <virtual/x11-7 )"
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/videoproto"
 
 src_compile() {
 	myconf="--with-cdparanoia --enable-cdparanoia"