diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 9a4187fea3aa..56c9653c8fe4 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.140 2006/07/01 16:36:17 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.141 2006/07/06 21:00:42 wolf31o2 Exp $ + + 06 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Added blocker on x11-drivers/nvidia-drivers and + x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet. 01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff: diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild index 5e43039624ad..a6e36d64b37d 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.0-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/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.10 2006/07/01 01:08:57 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.11 2006/07/06 21:00:42 wolf31o2 Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -145,6 +145,8 @@ RDEPEND="x11-libs/libXfont x11-libs/liblbxutil kdrive? ( sdl? ( media-libs/libsdl ) ) !media-video/nvidia-glx + !x11-drivers/nvidia-drivers + !x11-drivers/nvidia-legacy-drivers !x11-drivers/ati-drivers" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent |