Pinpoint virtual/x11 version to less than 7.

(Portage version: 2.1.1_pre2-r6)

9 files changed, 29 insertions, 23 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 727541758d97..1d1d0fe51601 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.298 2006/07/01 23:15:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.299 2006/07/09 06:01:34 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-3.3.2-r1.ebuild, kdebase-3.3.2-r2.ebuild, kdebase-3.3.2-r3.ebuild,
+  kdebase-3.4.3-r1.ebuild, kdebase-3.4.3-r2.ebuild, kdebase-3.5.2-r2.ebuild,
+  kdebase-3.5.3-r2.ebuild, kdebase-3.5.3-r3.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
 *kdebase-3.5.3-r3 (01 Jul 2006)
 
diff --git a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
index 93f215ca400f..5bbfd64c0b18 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-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/kdebase/kdebase-3.3.2-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r1.ebuild,v 1.16 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 			x11-apps/mkfontdir
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
index 6b37bc8e9b51..6ef7e2799ca5 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r2.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/kdebase/kdebase-3.3.2-r2.ebuild,v 1.12 2006/02/12 18:38:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r2.ebuild,v 1.13 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
 			x11-apps/mkfontdir
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
index b63dde5b2b56..1d437e37cd6d 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r3.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/kdebase/kdebase-3.3.2-r3.ebuild,v 1.7 2006/02/12 18:38:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r3.ebuild,v 1.8 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
 			x11-apps/mkfontdir
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
index e14c7def74f8..5732b60b2872 100644
--- a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.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/kdebase/kdebase-3.4.3-r1.ebuild,v 1.14 2006/03/23 22:44:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3-r1.ebuild,v 1.15 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}
 			x11-apps/mkfontdir
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.4.3-r2.ebuild b/kde-base/kdebase/kdebase-3.4.3-r2.ebuild
index 65bf761067a4..f6d0204eb159 100644
--- a/kde-base/kdebase/kdebase-3.4.3-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.3-r2.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/kdebase/kdebase-3.4.3-r2.ebuild,v 1.5 2006/06/17 12:01:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3-r2.ebuild,v 1.6 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}
 			x11-apps/mkfontdir
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild b/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
index 3bfafbfdb3ed..04deae55d41e 100644
--- a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.2-r2.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/kdebase/kdebase-3.5.2-r2.ebuild,v 1.7 2006/06/28 02:31:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r2.ebuild,v 1.8 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -47,7 +47,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 			x11-libs/libXext
 			xscreensaver? ( x11-libs/libXScrnSaver )
 			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xinit
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
 	xcomposite? ( || ( (
@@ -74,7 +74,7 @@ DEPEND="${DEPEND}
 			xscreensaver? ( x11-proto/scrnsaverproto )
 			xinerama? ( x11-proto/xineramaproto )
 			x11-apps/bdftopcf
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 PATCHES="${WORKDIR}/kdebase-3.5.2-patchset.diff"
diff --git a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild b/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
index 1aead7022867..67b7777210bd 100644
--- a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.3-r2.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/kdebase/kdebase-3.5.3-r2.ebuild,v 1.3 2006/06/28 02:31:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r2.ebuild,v 1.4 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 			x11-libs/libXext
 			xscreensaver? ( x11-libs/libXScrnSaver )
 			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xinit
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
 	xcomposite? ( || ( (
@@ -73,7 +73,7 @@ DEPEND="${DEPEND}
 			xscreensaver? ( x11-proto/scrnsaverproto )
 			xinerama? ( x11-proto/xineramaproto )
 			x11-apps/bdftopcf
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch"
diff --git a/kde-base/kdebase/kdebase-3.5.3-r3.ebuild b/kde-base/kdebase/kdebase-3.5.3-r3.ebuild
index 6020f96c1069..60811c53d0f4 100644
--- a/kde-base/kdebase/kdebase-3.5.3-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.3-r3.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/kdebase/kdebase-3.5.3-r3.ebuild,v 1.1 2006/07/01 23:15:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r3.ebuild,v 1.2 2006/07/09 06:01:34 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 			x11-libs/libXext
 			xscreensaver? ( x11-libs/libXScrnSaver )
 			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xinit
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
 	xcomposite? ( || ( (
@@ -73,7 +73,7 @@ DEPEND="${DEPEND}
 			xscreensaver? ( x11-proto/scrnsaverproto )
 			xinerama? ( x11-proto/xineramaproto )
 			x11-apps/bdftopcf
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch