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 | ead734c40a7717efd3f2fb47dabbe35826613781 (patch) | |
| tree | b5af6114c58e5b7cef5e7f75bfdda84e5a4ab981 | |
| parent | Stable on ppc, sparc. (diff) | |
| download | historical-ead734c40a7717efd3f2fb47dabbe35826613781.tar.gz historical-ead734c40a7717efd3f2fb47dabbe35826613781.tar.bz2 historical-ead734c40a7717efd3f2fb47dabbe35826613781.zip | |
Fix modular Xorg dependencies.
Package-Manager: portage-2.1_pre5-r1
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.1-r3.ebuild | 26 | ||||
| -rw-r--r-- | kde-base/kicker/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kicker/kicker-3.5.1-r1.ebuild | 19 |
4 files changed, 34 insertions, 22 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? ( || ( ( diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog index 93a2452fd1c2..2325bc29c1c9 100644 --- a/kde-base/kicker/ChangeLog +++ b/kde-base/kicker/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kicker # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.39 2006/02/03 17:38:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.40 2006/03/01 09:15:48 flameeyes Exp $ + + 01 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kicker-3.5.1-r1.ebuild: + Fix modular Xorg dependencies. *kicker-3.5.1-r1 (03 Feb 2006) diff --git a/kde-base/kicker/kicker-3.5.1-r1.ebuild b/kde-base/kicker/kicker-3.5.1-r1.ebuild index a6194877b5cb..444d307ef80f 100644 --- a/kde-base/kicker/kicker-3.5.1-r1.ebuild +++ b/kde-base/kicker/kicker-3.5.1-r1.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/kicker/kicker-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:38:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.1-r1.ebuild,v 1.2 2006/03/01 09:15:48 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV @@ -10,21 +10,20 @@ inherit kde-meta eutils DESCRIPTION="KDE panel housing varous applets" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="xcomposite" -PATCHES="$FILESDIR/applets-configure.in.in.diff" RDEPEND=" $(deprange $PV $MAXKDEVER kde-base/libkonq) $(deprange $PV $MAXKDEVER kde-base/kdebase-data) - xcomposite? ( || ( ( - x11-libs/libXcomposite - ) <=x11-base/xorg-x11-6.9 ) - )" + || ( ( + x11-libs/libXau + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + ) virtual/x11 ) + xcomposite? ( || ( x11-libs/libXcomposite <=x11-base/xorg-x11-6.9 ) )" DEPEND="${RDEPEND} - xcomposite? ( || ( ( - x11-proto/compositeproto - ) <=x11-base/xorg-x11-6.9 ) - )" + xcomposite? ( || ( x11-proto/compositeproto <=x11-base/xorg-x11-6.9 ) )" KMCOPYLIB="libkonq libkonq" KMEXTRACTONLY="libkonq |