diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-01 09:20:39 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-01 09:20:39 +0000 |
| commit | 53a82bc1335287b591719d5d19175bdcdeae8568 (patch) | |
| tree | 1418b0f3e5bbd0397a7bef7d5a8344eb5b548087 /kde-base/kdebase | |
| parent | Stable on ppc, sparc. (diff) | |
| download | gentoo-2-53a82bc1335287b591719d5d19175bdcdeae8568.tar.gz gentoo-2-53a82bc1335287b591719d5d19175bdcdeae8568.tar.bz2 gentoo-2-53a82bc1335287b591719d5d19175bdcdeae8568.zip | |
Fix modular Xorg dependencies.
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.1-r3.ebuild | 26 |
2 files changed, 21 insertions, 11 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 1c5c66c64e40..eb9d640694aa 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.261 2006/02/28 22:47:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.262 2006/03/01 09:20:39 flameeyes Exp $ + + 01 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + kdebase-3.5.1-r3.ebuild: + Fix modular Xorg dependencies. *kdebase-3.5.1-r3 (28 Feb 2006) diff --git a/kde-base/kdebase/kdebase-3.5.1-r3.ebuild b/kde-base/kdebase/kdebase-3.5.1-r3.ebuild index 0f3b31d9012a..95cd8c7bd632 100644 --- a/kde-base/kdebase/kdebase-3.5.1-r3.ebuild +++ b/kde-base/kdebase/kdebase-3.5.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r3.ebuild,v 1.1 2006/02/28 22:47:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r3.ebuild,v 1.2 2006/03/01 09:20:39 flameeyes Exp $ inherit kde-dist eutils flag-o-matic @@ -31,7 +31,20 @@ DEPEND="arts? ( ~kde-base/arts-${PV} ) hal? ( >=sys-apps/dbus-0.33 =sys-apps/hal-0.5* sys-apps/pmount ) - zeroconf? ( net-misc/mDNSResponder )" + zeroconf? ( net-misc/mDNSResponder ) + xcomposite? ( || ( ( + x11-libs/libXcomposite + x11-libs/libXdamage + ) <=x11-base/xorg-x11-6.9 ) + ) + || ( ( + x11-libs/libXau + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + xscreensaver? ( x11-libs/libXScrnSaver ) + xinerama? ( x11-libs/libXinerama ) + ) virtual/x11 )" RDEPEND="${DEPEND} sys-apps/usbutils @@ -45,14 +58,7 @@ RDEPEND="${DEPEND} x11-apps/mkfontdir || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) x11-apps/setxkbmap - ) virtual/x11 ) - xcomposite? ( || ( ( - x11-libs/libXcomposite - x11-libs/libXdamage - ) <=x11-base/xorg-x11-6.9 ) - ) - xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) ) - xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )" + ) virtual/x11 )" DEPEND="${DEPEND} xcomposite? ( || ( ( |