From: Carsten Lohrke <carlo@gentoo.org>
Date: Sun, 29 Apr 2007 17:16:08 +0000 (+0000)
Subject: Remove virtual/x11 dependency.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f49de9115db4a9f005f7b96e4ab300d6771f42b6;p=gentoo.git

Remove virtual/x11 dependency.
Package-Manager: portage-2.1.2.5
---

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index c916bf0b2a55..614278fd21ef 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.255 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.256 2007/04/29 17:16:08 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   21 Apr 2007; Wulf C. Krueger <philantrop@gentoo.org>
   kdenetwork-3.5.5-r1.ebuild, kdenetwork-3.5.5-r2.ebuild,
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild
index a6defc45d25b..9e98e77e83fc 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-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/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.8 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.9 2007/04/29 17:16:08 carlo Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -21,12 +21,10 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	sametime? ( =net-libs/meanwhile-1.0* )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
 	kernel_linux? ( virtual/opengl )"
 
 RDEPEND="${BOTH_DEPEND}
@@ -38,13 +36,10 @@ RDEPEND="${BOTH_DEPEND}
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			x11-proto/xproto
-			kernel_linux? ( x11-libs/libXv )
-			x11-proto/scrnsaverproto
-		) <virtual/x11-7 )
-	dev-util/pkgconfig"
+	x11-proto/videoproto
+	x11-proto/xproto
+	kernel_linux? ( x11-libs/libXv )
+	x11-proto/scrnsaverproto"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
 	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog
index 4ad0613a23b5..63beb97d8572 100644
--- a/kde-base/ksplashml/ChangeLog
+++ b/kde-base/ksplashml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksplashml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.69 2007/02/04 02:58:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.70 2007/04/29 17:13:30 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> ksplashml-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -ksplashml-3.5.2.ebuild:
diff --git a/kde-base/ksplashml/ksplashml-3.5.6.ebuild b/kde-base/ksplashml/ksplashml-3.5.6.ebuild
index f3b4aed4322f..8c59347c9ed3 100644
--- a/kde-base/ksplashml/ksplashml-3.5.6.ebuild
+++ b/kde-base/ksplashml/ksplashml-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/ksplashml/ksplashml-3.5.6.ebuild,v 1.1 2007/01/16 21:23:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.6.ebuild,v 1.2 2007/04/29 17:13:30 carlo Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,10 +11,10 @@ DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xinerama"
 
-RDEPEND="xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
+RDEPEND="xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )"
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	myconf="${myconf} $(use_with xinerama)"