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

(Portage version: 2.1.2.1)

4 files changed, 31 insertions, 59 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index aa8535400d17..5efc20e4573b 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.348 2007/02/12 14:04:46 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.349 2007/03/08 20:21:57 caleb Exp $
+
+  08 Mar 2007; Caleb Tennis <caleb@gentoo.org> kdebase-3.5.5-r1.ebuild,
+  kdebase-3.5.5-r3.ebuild, kdebase-3.5.6-r1.ebuild:
+  remove <xorg-x11-7 deps per bug #167408
 
   12 Feb 2007; Simon Stelling <blubb@gentoo.org> kdebase-3.5.5-r3.ebuild:
   stable on amd64; bug 164080
diff --git a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
index 2b23d4a39e0a..6e54ea49fb4f 100644
--- a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.5-r1.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/kdebase/kdebase-3.5.5-r1.ebuild,v 1.14 2007/01/05 16:56:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r1.ebuild,v 1.15 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,21 +31,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) <virtual/x11-7 )"
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXext
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xinerama? ( x11-libs/libXinerama )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -64,16 +58,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
diff --git a/kde-base/kdebase/kdebase-3.5.5-r3.ebuild b/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
index c91521f35070..36d61ef9ff33 100644
--- a/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.5-r3.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/kdebase/kdebase-3.5.5-r3.ebuild,v 1.9 2007/02/12 14:04:47 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r3.ebuild,v 1.10 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,11 +31,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
 	|| ( (
 			x11-libs/libX11
 			x11-libs/libXau
@@ -64,16 +60,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
diff --git a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
index b74a691e76e9..f4fd37b04529 100644
--- a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.6-r1.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/kdebase/kdebase-3.5.6-r1.ebuild,v 1.2 2007/02/04 17:41:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.3 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -30,11 +30,7 @@ DEPEND=">=media-libs/freetype-2
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
 	|| ( (
 			x11-libs/libX11
 			x11-libs/libXau
@@ -63,16 +59,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 need-kde 3.5.6