remove <xorg-x11-7 dep per bug #167408

(Portage version: 2.1.2.1)

4 files changed, 15 insertions, 34 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 6faf3807e680..006125fa5de1 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.92 2007/02/09 15:29:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.93 2007/03/08 20:27:47 caleb Exp $
+
+  08 Mar 2007; Caleb Tennis <caleb@gentoo.org> kwin-3.5.5-r1.ebuild,
+  kwin-3.5.5-r2.ebuild, kwin-3.5.6.ebuild:
+  remove <xorg-x11-7 dep per bug #167408
 
   09 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> kwin-3.5.5-r2.ebuild:
   Stable on amd64 wrt bug #164079.
diff --git a/kde-base/kwin/kwin-3.5.5-r1.ebuild b/kde-base/kwin/kwin-3.5.5-r1.ebuild
index 0d6c50393ebc..d017ebe06f77 100644
--- a/kde-base/kwin/kwin-3.5.5-r1.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-3.5.5-r1.ebuild,v 1.9 2006/12/11 12:03:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.5-r1.ebuild,v 1.10 2007/03/08 20:27:47 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -10,17 +10,8 @@ inherit kde-meta eutils
 DESCRIPTION="KDE window manager"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
-RDEPEND="xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)"
-DEPEND="${RDEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)"
+RDEPEND="xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )"
+DEPEND="${RDEPEND}"
 
 PATCHES="${FILESDIR}/${P}-input-shape.patch"
 
diff --git a/kde-base/kwin/kwin-3.5.5-r2.ebuild b/kde-base/kwin/kwin-3.5.5-r2.ebuild
index 8058b9874b6b..bf27ca3c33f1 100644
--- a/kde-base/kwin/kwin-3.5.5-r2.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-3.5.5-r2.ebuild,v 1.11 2007/02/09 15:29:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.5-r2.ebuild,v 1.12 2007/03/08 20:27:47 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -10,15 +10,8 @@ inherit kde-meta eutils
 DESCRIPTION="KDE window manager"
 KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
-RDEPEND="xcomposite? (
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	)"
-DEPEND="${RDEPEND}
-	xcomposite? (
-		x11-proto/compositeproto
-		x11-proto/damageproto
-	)"
+RDEPEND="xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )"
+DEPEND="${RDEPEND}"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
diff --git a/kde-base/kwin/kwin-3.5.6.ebuild b/kde-base/kwin/kwin-3.5.6.ebuild
index c6780654ee44..e0eecd6e7105 100644
--- a/kde-base/kwin/kwin-3.5.6.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-3.5.6.ebuild,v 1.2 2007/01/17 00:19:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.6.ebuild,v 1.3 2007/03/08 20:27:47 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -10,15 +10,8 @@ inherit kde-meta eutils
 DESCRIPTION="KDE window manager"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
-RDEPEND="xcomposite? (
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	)"
-DEPEND="${RDEPEND}
-	xcomposite? (
-		x11-proto/compositeproto
-		x11-proto/damageproto
-	)"
+RDEPEND="xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )"
+DEPEND="${RDEPEND}"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"