Remove virtual/x11 dependency.

Package-Manager: portage-2.1.2.5

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 65f507fc20e4d97253b634b04706fabd5f2b6f52..6755ab24df6844dbd5f44af092296b726449404b 100644 (file)
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.197 2007/02/05 12:22:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.198 2007/04/29 16:33:58 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kdeutils-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kdeutils-3.4.3-klaptopdaemon.patch,

diff --git a/kde-base/kdeutils/kdeutils-3.5.6.ebuild b/kde-base/kdeutils/kdeutils-3.5.6.ebuild
index c7b89ce3c6f695921ed8fec3d8b63ec76f0f1a0c..3f471bfd77ec4cf06dea07a0becbfd74668658eb 100644 (file)
--- a/kde-base/kdeutils/kdeutils-3.5.6.ebuild
+++ b/kde-base/kdeutils/kdeutils-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/kdeutils/kdeutils-3.5.6.ebuild,v 1.4 2007/02/04 17:46:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.6.ebuild,v 1.5 2007/04/29 16:33:58 carlo Exp $
 
 inherit kde-dist eutils
 
@@ -17,17 +17,15 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
        pbbuttonsd? ( app-laptop/pbbuttonsd )
        dev-lang/python
        dev-libs/gmp
-       || ( x11-libs/libXtst <virtual/x11-7 )"
+       x11-libs/libXtst"
 
 RDEPEND="${BOTH_DEPEND}
        crypt? ( app-crypt/gnupg )
        !x11-misc/superkaramba"
 
 DEPEND="${BOTH_DEPEND}
-       || ( (
-                       x11-libs/libX11
-                       x11-proto/xproto
-               ) <virtual/x11-7 )
+       x11-libs/libX11
+       x11-proto/xproto
        virtual/os-headers"
 
 src_unpack() {
@@ -49,4 +47,3 @@ src_install() {
        # see bug 144731
        rm ${D}${KDEDIR}/share/applications/kde/ksim.desktop
 }
-

diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index e70626a9c7bda9da08160fc1b6c5b94529ecab86..2dcf978856fb04abe3b49ed1954dc10091b73a71 100644 (file)
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.73 2007/02/05 12:10:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.74 2007/04/29 16:30:22 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> klaptopdaemon-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kdeutils-3.4.3-klaptopdaemon.patch:

diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.6.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.6.ebuild
index 85386eb6f3d0a0300fc2159ae5f7ac82bf4f00ec..3da14d3b99b9393a25c0d6d9e0e34bf0d565fe50 100644 (file)
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.6.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-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/klaptopdaemon/klaptopdaemon-3.5.6.ebuild,v 1.2 2007/02/03 09:42:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.6.ebuild,v 1.3 2007/04/29 16:30:22 carlo Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -14,11 +14,9 @@ DESCRIPTION="KLaptopdaemon - KDE battery monitoring and management for laptops."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-RDEPEND="|| ( x11-libs/libXtst <virtual/x11-7 )"
+RDEPEND="x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
-       || ( (
-                       x11-libs/libX11
-                       x11-proto/xproto
-               ) <virtual/x11-7 )
+       x11-libs/libX11
+       x11-proto/xproto
        virtual/os-headers"

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index d7a215c71c28ebd4e110362ac34fe24217be0182..8420c19ae8acc88be7fc447b61c73f8d26db2a9c 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.105 2007/02/05 12:24:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.106 2007/04/29 16:34:48 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kopete-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kopete-0.12.1-icqfix3.patch, -files/kopete-3.5.3-icqfix.patch,

diff --git a/kde-base/kopete/kopete-3.5.6.ebuild b/kde-base/kopete/kopete-3.5.6.ebuild
index 658b771863f32c33f39bf49bfdcd82c4fa1b92d8..022304ef2e3aa48215db1c0565368aca2f2cba04 100644 (file)
--- a/kde-base/kopete/kopete-3.5.6.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.5.6.ebuild,v 1.2 2007/01/17 01:23:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.6.ebuild,v 1.3 2007/04/29 16:34:48 carlo Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -31,12 +31,10 @@ BOTH_DEPEND="dev-libs/libxslt
                >=media-libs/speex-1.1.6
                dev-libs/expat
                ~net-libs/ortp-0.7.1 )
-       || ( (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrender
-               xscreensaver? ( x11-libs/libXScrnSaver )
-               ) <virtual/x11-7 )
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXrender
+       xscreensaver? ( x11-libs/libXScrnSaver )
        kernel_linux? ( virtual/opengl )
        sms? ( app-mobilephone/gsmlib )"
 
@@ -53,11 +51,9 @@ RDEPEND="${BOTH_DEPEND}
 
 DEPEND="${BOTH_DEPEND}
        kernel_linux? ( virtual/os-headers )
-       || ( (
-                       x11-proto/videoproto
-                       kernel_linux? ( x11-libs/libXv )
-                       xscreensaver? ( x11-proto/scrnsaverproto )
-               ) <virtual/x11-7 )"
+       x11-proto/videoproto
+       kernel_linux? ( x11-libs/libXv )
+       xscreensaver? ( x11-proto/scrnsaverproto )"
 
 pkg_setup() {
        if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then

diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog
index f9018ca3f713c4f7350de673527c4d51b8824b5d..df345c9358962cbe6d860b57b2497756380b20d2 100644 (file)
--- a/kde-base/mpeglib/ChangeLog
+++ b/kde-base/mpeglib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/mpeglib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.45 2007/02/05 12:15:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.46 2007/04/29 16:32:00 carlo Exp $
+
+  29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> mpeglib-3.5.6.ebuild:
+  Remove virtual/x11 dependency.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kdemultimedia-3.4.0-amd64.patch:

diff --git a/kde-base/mpeglib/mpeglib-3.5.6.ebuild b/kde-base/mpeglib/mpeglib-3.5.6.ebuild
index da911f9449f90d5aeb9941392dbbd291a988e85c..12695a53e13bf7364e1e1a82e1a8c354ac33a0a1 100644 (file)
--- a/kde-base/mpeglib/mpeglib-3.5.6.ebuild
+++ b/kde-base/mpeglib/mpeglib-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/mpeglib/mpeglib-3.5.6.ebuild,v 1.2 2007/01/20 00:35:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.6.ebuild,v 1.3 2007/04/29 16:32:00 carlo Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -11,19 +11,15 @@ DESCRIPTION="KDE mpeg library"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 RDEPEND="media-sound/cdparanoia
-       || ( (
-                       x11-libs/libXext
-                       x11-libs/libXxf86dga
-                       x11-libs/libXxf86vm
-               ) <virtual/x11-7 )
+       x11-libs/libXext
+       x11-libs/libXxf86dga
+       x11-libs/libXxf86vm
        media-libs/libvorbis"
 
 DEPEND="${RDEPEND}
-       || ( (
-                       x11-proto/xf86dgaproto
-                       x11-proto/xf86vidmodeproto
-                       x11-proto/videoproto
-               ) <virtual/x11-7 )"
+       x11-proto/xf86dgaproto
+       x11-proto/xf86vidmodeproto
+       x11-proto/videoproto"
 
 src_compile() {
        myconf="--with-cdparanoia --enable-cdparanoia"