summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdebase/kdebase-3.5.5-r3.ebuild')
-rw-r--r--kde-base/kdebase/kdebase-3.5.5-r3.ebuild22
1 files changed, 6 insertions, 16 deletions
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