Pinpoint virtual/x11 version to less than 7.

Package-Manager: portage-2.1.1_pre2-r6

23 files changed, 80 insertions, 52 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 710764e956d5..515a2306988e 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.208 2006/07/07 14:13:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.209 2006/07/09 19:48:39 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdenetwork-3.5.2.ebuild, kdenetwork-3.5.3.ebuild,
+  kdenetwork-3.5.3-r1.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   07 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdenetwork-3.5.2.ebuild, kdenetwork-3.5.3.ebuild,
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild
index ba6b21a61764..a6f878bbdb65 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild,v 1.11 2006/07/07 14:13:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild,v 1.12 2006/07/09 19:48:39 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -24,7 +24,7 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 		x11-libs/libXext
 		x11-libs/libXrender
 		x11-libs/libXScrnSaver
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -41,7 +41,7 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/xproto
 			kernel_linux? ( x11-libs/libXv )
 			x11-proto/scrnsaverproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild
index 1b7e0fa44cbc..922712a2e62d 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild,v 1.2 2006/07/07 14:13:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild,v 1.3 2006/07/09 19:48:39 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -27,7 +27,7 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 		x11-libs/libXext
 		x11-libs/libXrender
 		x11-libs/libXScrnSaver
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -44,7 +44,7 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/xproto
 			kernel_linux? ( x11-libs/libXv )
 			x11-proto/scrnsaverproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 pkg_setup() {
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild
index ba0d6b1aa634..e5457a69668a 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild,v 1.2 2006/07/07 14:13:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild,v 1.3 2006/07/09 19:48:39 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -24,7 +24,7 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 		x11-libs/libXext
 		x11-libs/libXrender
 		x11-libs/libXScrnSaver
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -41,7 +41,7 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/xproto
 			kernel_linux? ( x11-libs/libXv )
 			x11-proto/scrnsaverproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 061047b5edd6..468932ba8be5 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.55 2006/07/01 21:34:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.56 2006/07/09 19:51:34 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kdesktop-3.5.2.ebuild,
+  kdesktop-3.5.3.ebuild, kdesktop-3.5.3-r1.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
 *kdesktop-3.5.3-r1 (01 Jul 2006)
 
diff --git a/kde-base/kdesktop/kdesktop-3.5.2.ebuild b/kde-base/kdesktop/kdesktop-3.5.2.ebuild
index f6aebee227fa..e6b13349337c 100644
--- a/kde-base/kdesktop/kdesktop-3.5.2.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.2.ebuild,v 1.10 2006/06/01 08:01:44 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.2.ebuild,v 1.11 2006/07/09 19:51:34 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -17,7 +17,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdm)
 $(deprange $PV $MAXKDEVER kde-base/kcontrol)
 	xscreensaver? ( || ( (
 			x11-proto/scrnsaverproto
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -27,7 +27,7 @@ $(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 $(deprange 3.5.0 $MAXKDEVER kde-base/kdialog)
 	xscreensaver? ( || ( (
 			x11-libs/libXScrnSaver
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 
 KMCOPYLIB="libkonq libkonq/"
diff --git a/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild
index d2629cba9d24..3d7e360e69f9 100644
--- a/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild,v 1.1 2006/07/01 21:34:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild,v 1.2 2006/07/09 19:51:34 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -17,7 +17,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdm)
 $(deprange $PV $MAXKDEVER kde-base/kcontrol)
 	xscreensaver? ( || ( (
 			x11-proto/scrnsaverproto
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -27,7 +27,7 @@ $(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 $(deprange $PV $MAXKDEVER kde-base/kdialog)
 	xscreensaver? ( || ( (
 			x11-libs/libXScrnSaver
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 
 KMCOPYLIB="libkonq libkonq/"
diff --git a/kde-base/kdesktop/kdesktop-3.5.3.ebuild b/kde-base/kdesktop/kdesktop-3.5.3.ebuild
index df02a734f363..85cd9a641e20 100644
--- a/kde-base/kdesktop/kdesktop-3.5.3.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.3.ebuild,v 1.1 2006/06/01 18:09:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.3.ebuild,v 1.2 2006/07/09 19:51:34 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -17,7 +17,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdm)
 $(deprange $PV $MAXKDEVER kde-base/kcontrol)
 	xscreensaver? ( || ( (
 			x11-proto/scrnsaverproto
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -27,7 +27,7 @@ $(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 $(deprange $PV $MAXKDEVER kde-base/kdialog)
 	xscreensaver? ( || ( (
 			x11-libs/libXScrnSaver
-			) virtual/x11 )
+			) <virtual/x11-7 )
 		)"
 
 KMCOPYLIB="libkonq libkonq/"
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 95482ec53749..4315ade85a3a 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.170 2006/06/14 14:12:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.171 2006/07/09 19:57:14 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kdeutils-3.5.2.ebuild,
+  kdeutils-3.5.3.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   14 Jun 2006; Stefan Schweizer <genstef@gentoo.org> ChangeLog:
   Fix broken Manifest, bug 136762
diff --git a/kde-base/kdeutils/kdeutils-3.5.2.ebuild b/kde-base/kdeutils/kdeutils-3.5.2.ebuild
index 4b4520ee6c40..8b0476d78d41 100644
--- a/kde-base/kdeutils/kdeutils-3.5.2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.2.ebuild,v 1.10 2006/06/03 16:12:46 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.2.ebuild,v 1.11 2006/07/09 19:57:14 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -15,7 +15,7 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	dev-lang/python
 	xmms? ( media-sound/xmms )
 	dev-libs/gmp
-	|| ( x11-libs/libXtst virtual/x11 )"
+	|| ( x11-libs/libXtst <virtual/x11-7 )"
 
 RDEPEND="${BOTH_DEPEND}
 	crypt? ( app-crypt/gnupg )
@@ -26,7 +26,7 @@ DEPEND="${BOTH_DEPEND}
 			x11-libs/libX11
 			x11-proto/xextproto
 			x11-proto/xproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	virtual/os-headers"
 
 src_unpack() {
diff --git a/kde-base/kdeutils/kdeutils-3.5.3.ebuild b/kde-base/kdeutils/kdeutils-3.5.3.ebuild
index ccbab50e0f4f..55202b1176f5 100644
--- a/kde-base/kdeutils/kdeutils-3.5.3.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.3.ebuild,v 1.2 2006/06/12 23:57:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.3.ebuild,v 1.3 2006/07/09 19:57:14 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -15,7 +15,7 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	dev-lang/python
 	xmms? ( media-sound/xmms )
 	dev-libs/gmp
-	|| ( x11-libs/libXtst virtual/x11 )"
+	|| ( x11-libs/libXtst <virtual/x11-7 )"
 
 RDEPEND="${BOTH_DEPEND}
 	crypt? ( app-crypt/gnupg )
@@ -26,7 +26,7 @@ DEPEND="${BOTH_DEPEND}
 			x11-libs/libX11
 			x11-proto/xextproto
 			x11-proto/xproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	virtual/os-headers"
 
 src_unpack() {
diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 881224b0857c..6a6072b66953 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.55 2006/06/14 18:32:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.56 2006/07/09 19:50:09 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kicker-3.5.2.ebuild,
+  kicker-3.5.3.ebuild, kicker-3.5.3-r1.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
 *kicker-3.5.3-r1 (14 Jun 2006)
 
diff --git a/kde-base/kicker/kicker-3.5.2.ebuild b/kde-base/kicker/kicker-3.5.2.ebuild
index f7432511b14f..83616138c451 100644
--- a/kde-base/kicker/kicker-3.5.2.ebuild
+++ b/kde-base/kicker/kicker-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.2.ebuild,v 1.11 2006/06/01 05:37:00 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.2.ebuild,v 1.12 2006/07/09 19:50:09 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -19,7 +19,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
 			x11-libs/libXfixes
 			x11-libs/libXrender
 			x11-libs/libXtst
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
 
 DEPEND="${RDEPEND}
diff --git a/kde-base/kicker/kicker-3.5.3-r1.ebuild b/kde-base/kicker/kicker-3.5.3-r1.ebuild
index 7f83a6582358..5f99ef9b54c1 100644
--- a/kde-base/kicker/kicker-3.5.3-r1.ebuild
+++ b/kde-base/kicker/kicker-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.3-r1.ebuild,v 1.1 2006/06/14 18:32:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.3-r1.ebuild,v 1.2 2006/07/09 19:50:09 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -22,7 +22,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
 			x11-libs/libXfixes
 			x11-libs/libXrender
 			x11-libs/libXtst
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
 
 DEPEND="${RDEPEND}
diff --git a/kde-base/kicker/kicker-3.5.3.ebuild b/kde-base/kicker/kicker-3.5.3.ebuild
index 7b46d19eeaee..b2ad45d2e345 100644
--- a/kde-base/kicker/kicker-3.5.3.ebuild
+++ b/kde-base/kicker/kicker-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.3.ebuild,v 1.1 2006/06/01 18:37:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.3.ebuild,v 1.2 2006/07/09 19:50:09 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -19,7 +19,7 @@ $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
 			x11-libs/libXfixes
 			x11-libs/libXrender
 			x11-libs/libXtst
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
 
 DEPEND="${RDEPEND}
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index e65f41627658..bf972bff40f2 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.54 2006/06/01 18:46:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.55 2006/07/09 19:58:26 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  klaptopdaemon-3.5.2.ebuild, klaptopdaemon-3.5.3.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
 *klaptopdaemon-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild
index 7bbffb8bb4a3..07206834d80a 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild,v 1.9 2006/06/01 10:29:53 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.2.ebuild,v 1.10 2006/07/09 19:58:26 flameeyes Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -11,14 +11,14 @@ DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
 KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXtst virtual/x11 )"
+RDEPEND="|| ( x11-libs/libXtst <virtual/x11-7 )"
 
 DEPEND="${RDEPEND}
 	|| ( (
 			x11-libs/libX11
 			x11-proto/xextproto
 			x11-proto/xproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	virtual/os-headers"
 
 # Fix output of klaptopdaemon (kde bug 103437).
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild
index 3355e3bb1029..abf1e256f4e4 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild,v 1.1 2006/06/01 18:46:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.3.ebuild,v 1.2 2006/07/09 19:58:26 flameeyes Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -11,14 +11,14 @@ DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXtst virtual/x11 )"
+RDEPEND="|| ( x11-libs/libXtst <virtual/x11-7 )"
 
 DEPEND="${RDEPEND}
 	|| ( (
 			x11-libs/libX11
 			x11-proto/xextproto
 			x11-proto/xproto
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	virtual/os-headers"
 
 # Fix output of klaptopdaemon (kde bug 103437).
diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog
index 1d57937c1320..7a7e64297b22 100644
--- a/kde-base/ksplashml/ChangeLog
+++ b/kde-base/ksplashml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksplashml
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.50 2006/06/01 20:01:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.51 2006/07/09 19:54:25 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> ksplashml-3.5.2.ebuild,
+  ksplashml-3.5.3.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
 *ksplashml-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/ksplashml/ksplashml-3.5.2.ebuild b/kde-base/ksplashml/ksplashml-3.5.2.ebuild
index b949e38dfcc8..4e91f148c1ec 100644
--- a/kde-base/ksplashml/ksplashml-3.5.2.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.2.ebuild,v 1.10 2006/06/01 08:02:41 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.2.ebuild,v 1.11 2006/07/09 19:54:25 flameeyes 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="xinerama"
 
-RDEPEND="xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+RDEPEND="xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )"
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )"
 
 src_compile() {
 	myconf="${myconf} $(use_with xinerama)"
diff --git a/kde-base/ksplashml/ksplashml-3.5.3.ebuild b/kde-base/ksplashml/ksplashml-3.5.3.ebuild
index 3ec582faed16..746a69e0272c 100644
--- a/kde-base/ksplashml/ksplashml-3.5.3.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.3.ebuild,v 1.1 2006/06/01 20:01:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.3.ebuild,v 1.2 2006/07/09 19:54:25 flameeyes 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="xinerama"
 
-RDEPEND="xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+RDEPEND="xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )"
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )"
 
 src_compile() {
 	myconf="${myconf} $(use_with xinerama)"
diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog
index dd19ccfbb091..c0dc2b1b2420 100644
--- a/kde-base/mpeglib/ChangeLog
+++ b/kde-base/mpeglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/mpeglib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.37 2006/06/22 13:04:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.38 2006/07/09 19:55:42 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> mpeglib-3.5.1.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> mpeglib-3.4.1.ebuild,
   mpeglib-3.5.1.ebuild:
diff --git a/kde-base/mpeglib/mpeglib-3.5.1.ebuild b/kde-base/mpeglib/mpeglib-3.5.1.ebuild
index 77e5eaac21d6..c51af2100fff 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
 # 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.10 2006/06/22 13:04:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.1.ebuild,v 1.11 2006/07/09 19:55:42 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=3.5.3
@@ -15,7 +15,7 @@ RDEPEND="media-sound/cdparanoia
 			x11-libs/libXext
 			x11-libs/libXxf86dga
 			x11-libs/libXxf86vm
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	media-libs/libvorbis"
 
 DEPEND="${RDEPEND}
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xf86vidmodeproto
 			x11-proto/videoproto
 			x11-proto/xextproto
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 src_compile() {
 	myconf="--with-cdparanoia --enable-cdparanoia"