Remove virtual/x11 from dependencies.

(Portage version: 2.1.3_rc8)

5 files changed, 18 insertions, 14 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index dccbe95e7dff..d0fed278721a 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.92 2007/05/23 10:30:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.93 2007/07/22 10:47:47 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> kdesktop-3.5.5.ebuild,
+  kdesktop-3.5.5-r1.ebuild, kdesktop-3.5.6.ebuild, kdesktop-3.5.6-r1.ebuild:
+  Remove virtual/x11 from dependencies.
 
   23 May 2007; Carsten Lohrke <carlo@gentoo.org> kdesktop-3.5.7.ebuild:
   Correct dependencies.
diff --git a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
index e98e6cd8afef..4b8b7c8397f6 100644
--- a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
+++ b/kde-base/kdesktop/kdesktop-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/kdesktop/kdesktop-3.5.5-r1.ebuild,v 1.11 2007/04/21 20:50:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild,v 1.12 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.5.ebuild b/kde-base/kdesktop/kdesktop-3.5.5.ebuild
index f2fc85cd74fa..e4273038171f 100644
--- a/kde-base/kdesktop/kdesktop-3.5.5.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.5.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/kdesktop/kdesktop-3.5.5.ebuild,v 1.9 2006/12/11 14:12:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.5.ebuild,v 1.10 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
index 6f6b0f7480b2..5e7ed78863fe 100644
--- a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
+++ b/kde-base/kdesktop/kdesktop-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/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.1 2007/04/15 22:46:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.2 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
 	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
diff --git a/kde-base/kdesktop/kdesktop-3.5.6.ebuild b/kde-base/kdesktop/kdesktop-3.5.6.ebuild
index eb670b552131..41838f5bae4e 100644
--- a/kde-base/kdesktop/kdesktop-3.5.6.ebuild
+++ b/kde-base/kdesktop/kdesktop-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/kdesktop/kdesktop-3.5.6.ebuild,v 1.2 2007/01/18 00:25:18 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6.ebuild,v 1.3 2007/07/22 10:47:47 omp Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
 	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
 	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h