Correct Xorg dependency.

Package-Manager: portage-2203-svn

6 files changed, 21 insertions, 12 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 2409b9947035..e979a734923a 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,9 @@
 # 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.271 2006/04/17 18:36:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.272 2006/05/06 10:40:02 carlo Exp $
+
+  06 May 2006; Carsten Lohrke <carlo@gentoo.org> kdebase-3.5.2-r1.ebuild:
+  Correct Xorg dependency.
 
 *kdebase-3.5.2-r1 (17 Apr 2006)
 
diff --git a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
index 804594d3f04b..be1f430d2043 100644
--- a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.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.5.2-r1.ebuild,v 1.1 2006/04/17 18:36:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.2 2006/05/06 10:40:03 carlo Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -36,7 +36,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	xcomposite? ( || ( (
 			x11-libs/libXcomposite
 			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
+			) <x11-base/xorg-x11-7 )
 		)
 	|| ( (
 			x11-libs/libX11
@@ -67,7 +67,7 @@ DEPEND="${DEPEND}
 	xcomposite? ( || ( (
 			x11-proto/compositeproto
 			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
+			) <x11-base/xorg-x11-7 )
 		)
 	|| ( (
 			xscreensaver? ( x11-proto/scrnsaverproto )
diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 6eca5f076fd0..d0131f28a885 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,9 @@
 # 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.45 2006/04/06 01:55:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.46 2006/05/06 10:43:24 carlo Exp $
+
+  06 May 2006; Carsten Lohrke <carlo@gentoo.org> kicker-3.5.2.ebuild:
+  Correct Xorg dependency.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/kdebase-3.5.1-kicker.patch, -kicker-3.5.0.ebuild,
diff --git a/kde-base/kicker/kicker-3.5.2.ebuild b/kde-base/kicker/kicker-3.5.2.ebuild
index e6477421f223..dcbcc7c5a4f4 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.3 2006/04/01 17:31:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.2.ebuild,v 1.4 2006/05/06 10:43:24 carlo Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -20,10 +20,10 @@ $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
 			x11-libs/libXrender
 			x11-libs/libXtst
 		) virtual/x11 )
-	xcomposite? ( || ( x11-libs/libXcomposite <=x11-base/xorg-x11-6.9 ) )"
+	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
 
 DEPEND="${RDEPEND}
-	xcomposite? ( || ( x11-proto/compositeproto <=x11-base/xorg-x11-6.9 ) )"
+	xcomposite? ( || ( x11-proto/compositeproto <x11-base/xorg-x11-7 ) )"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY="libkonq
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 5fbb07b59442..7bae1da0ef0c 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.51 2006/04/17 18:54:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.52 2006/05/06 10:45:54 carlo Exp $
+
+  06 May 2006; Carsten Lohrke <carlo@gentoo.org> kwin-3.5.2-r2.ebuild:
+  Correct Xorg dependency.
 
   17 Apr 2006; Carsten Lohrke <carlo@gentoo.org> kwin-3.5.2-r2.ebuild:
   Restore ~x86-fbsd.
diff --git a/kde-base/kwin/kwin-3.5.2-r2.ebuild b/kde-base/kwin/kwin-3.5.2-r2.ebuild
index ffe4411199a8..27f09634bb12 100644
--- a/kde-base/kwin/kwin-3.5.2-r2.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-3.5.2-r2.ebuild,v 1.2 2006/04/17 18:54:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.2-r2.ebuild,v 1.3 2006/05/06 10:45:54 carlo Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -13,13 +13,13 @@ IUSE="xcomposite"
 RDEPEND="xcomposite? ( || ( (
 			x11-libs/libXcomposite
 			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
+			) <x11-base/xorg-x11-7 )
 		)"
 DEPEND="${RDEPEND}
 	xcomposite? ( || ( (
 			x11-proto/compositeproto
 			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
+			) <x11-base/xorg-x11-7 )
 		)"
 
 PATCHES="${FILESDIR}/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff"