Drop virtual/x11 dependency.

(Portage version: 2.1.3_rc8)

6 files changed, 88 insertions, 101 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index f9160e7c5aca..5a96326f4555 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # 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.375 2007/07/20 19:57:48 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.376 2007/07/22 10:43:00 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> kdebase-3.5.5-r1.ebuild,
+  kdebase-3.5.5-r3.ebuild, kdebase-3.5.5-r4.ebuild, kdebase-3.5.6-r1.ebuild,
+  kdebase-3.5.6-r2.ebuild:
+  Drop virtual/x11 dependency.
 
 *kdebase-3.5.7-r2 (20 Jul 2007)
 
diff --git a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
index 43e661b1ef27..f8fefa51707f 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.17 2007/07/08 04:20:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r1.ebuild,v 1.18 2007/07/22 10:43:00 calchan Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -45,17 +45,15 @@ RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	java? ( >=virtual/jre-1.4 )
 	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			x11-apps/xinit
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-			x11-apps/xprop
-		) <virtual/x11-7 )"
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap
+	x11-apps/xprop"
 
 DEPEND="${DEPEND}
 	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
diff --git a/kde-base/kdebase/kdebase-3.5.5-r3.ebuild b/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
index 76f76c8df277..817b54afceac 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.13 2007/07/08 04:20:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r3.ebuild,v 1.14 2007/07/22 10:43:01 calchan Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -32,32 +32,28 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
 	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 )
-		) <virtual/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 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	java? ( >=virtual/jre-1.4 )
 	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			x11-apps/xinit
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-			x11-apps/xprop
-		) <virtual/x11-7 )"
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap
+	x11-apps/xprop"
 
 DEPEND="${DEPEND}
 	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
diff --git a/kde-base/kdebase/kdebase-3.5.5-r4.ebuild b/kde-base/kdebase/kdebase-3.5.5-r4.ebuild
index bd711d0e02ed..cfd9c0a2d432 100644
--- a/kde-base/kdebase/kdebase-3.5.5-r4.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.5-r4.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-r4.ebuild,v 1.11 2007/07/08 04:20:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r4.ebuild,v 1.12 2007/07/22 10:43:01 calchan Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -32,32 +32,28 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
 	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 )
-		) <virtual/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 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	java? ( >=virtual/jre-1.4 )
 	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			x11-apps/xinit
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-			x11-apps/xprop
-		) <virtual/x11-7 )"
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap
+	x11-apps/xprop"
 
 DEPEND="${DEPEND}
 	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
diff --git a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
index 711ab1ecd4f7..4d87e796c3e5 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.8 2007/07/08 04:20:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.9 2007/07/22 10:43:01 calchan Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,33 +31,29 @@ DEPEND=">=media-libs/freetype-2
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
 	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 )
-		) <virtual/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 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	sys-devel/gdb
 	java? ( >=virtual/jre-1.4 )
 	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			x11-apps/xinit
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-			x11-apps/xprop
-		) <virtual/x11-7 )"
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap
+	x11-apps/xprop"
 
 DEPEND="${DEPEND}
 	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
diff --git a/kde-base/kdebase/kdebase-3.5.6-r2.ebuild b/kde-base/kdebase/kdebase-3.5.6-r2.ebuild
index fc690e41eeee..f4b705d478f2 100644
--- a/kde-base/kdebase/kdebase-3.5.6-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.6-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/kdebase/kdebase-3.5.6-r2.ebuild,v 1.4 2007/07/08 04:20:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r2.ebuild,v 1.5 2007/07/22 10:43:01 calchan Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,33 +31,29 @@ DEPEND=">=media-libs/freetype-2
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
 	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 )
-		) <virtual/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 )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	sys-devel/gdb
 	java? ( >=virtual/jre-1.4 )
 	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			x11-apps/xinit
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-			x11-apps/xprop
-		) <virtual/x11-7 )"
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/setxkbmap
+	x11-apps/xprop"
 
 DEPEND="${DEPEND}
 	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )