Pinpoint virtual/x11 version to less than 7.

(Portage version: 2.1.1_pre2-r6)

6 files changed, 16 insertions, 11 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index cf0ef8655760..8526f95fb40d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.344 2006/07/03 12:20:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.345 2006/07/09 04:48:48 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdelibs-3.5.2-r6.ebuild, kdelibs-3.5.3.ebuild, kdelibs-3.5.3-r1.ebuild,
+  kdelibs-3.5.3-r2.ebuild, kdelibs-3.5.3-r3.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   03 Jul 2006; Caleb Tennis <caleb@gentoo.org> kdelibs-3.5.2-r6.ebuild,
   kdelibs-3.5.3-r3.ebuild:
diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild
index 9faeebae34c9..6a5f693778a1 100644
--- a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.2-r6.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/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.11 2006/07/03 12:20:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.12 2006/07/09 04:48:48 flameeyes Exp $
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND}
-	|| ( ( x11-apps/rgb x11-apps/iceauth ) virtual/x11 )"
+	|| ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 )"
 
 PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch
diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild
index fc76720ab42b..ed926b79b5c0 100644
--- a/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.5.3-r1.ebuild,v 1.1 2006/06/09 01:02:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild,v 1.2 2006/07/09 04:48:48 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND}
-	|| ( x11-apps/rgb virtual/x11 )"
+	|| ( x11-apps/rgb <virtual/x11-7 )"
 
 PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch"
diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild
index 08841c1e84ba..aefccec39852 100644
--- a/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.5.3-r2.ebuild,v 1.2 2006/06/15 00:36:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild,v 1.3 2006/07/09 04:48:48 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND}
-	|| ( x11-apps/rgb virtual/x11 )"
+	|| ( x11-apps/rgb <virtual/x11-7 )"
 
 pkg_setup() {
 	if use legacyssl ; then
diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r3.ebuild
index b8e34d683dfb..c876b9fa32e7 100644
--- a/kde-base/kdelibs/kdelibs-3.5.3-r3.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.5.3-r3.ebuild,v 1.2 2006/07/03 12:20:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r3.ebuild,v 1.3 2006/07/09 04:48:48 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND}
-	|| ( ( x11-apps/rgb x11-apps/iceauth ) virtual/x11 )"
+	|| ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 )"
 
 pkg_setup() {
 	if use legacyssl ; then
diff --git a/kde-base/kdelibs/kdelibs-3.5.3.ebuild b/kde-base/kdelibs/kdelibs-3.5.3.ebuild
index 19ca7fb50f14..7ec9adcb3bb0 100644
--- a/kde-base/kdelibs/kdelibs-3.5.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.5.3.ebuild,v 1.3 2006/06/05 22:07:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3.ebuild,v 1.4 2006/07/09 04:48:48 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND}
-	|| ( x11-apps/rgb virtual/x11 )"
+	|| ( x11-apps/rgb <virtual/x11-7 )"
 
 PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch"