summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index bc3c243b62c8..7deeb7a20757 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.127 2006/06/21 02:40:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.128 2006/06/27 02:43:54 joshuabaergen Exp $
+
+ 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ xorg-server-1.1.0-r1.ebuild:
+ Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself.
+ (Patch by Ed Catmur, bug #137991)
21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-server-1.1.0-r1.ebuild:
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 d5c19e8aa591..de389982c902 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.2 2006/06/21 02:40:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.3 2006/06/27 02:43:54 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -227,7 +227,7 @@ PDEPEND="
input_devices_synaptics? ( x11-drivers/synaptics )
input_devices_wacom? ( x11-misc/linuxwacom )
)
- (
+ !minimal? (
>=x11-drivers/xf86-input-acecad-1.1.0
>=x11-drivers/xf86-input-calcomp-1.1.0
>=x11-drivers/xf86-input-citron-2.2.0
@@ -326,7 +326,7 @@ PDEPEND="
video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
)
- (
+ !minimal? (
>=x11-drivers/xf86-video-dummy-0.2.0
>=x11-drivers/xf86-video-fbdev-0.2.0
@@ -496,7 +496,7 @@ PDEPEND="
LICENSE="${LICENSE} MIT"
pkg_setup() {
- ensure_a_server_is_building
+ use minimal || ensure_a_server_is_building
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh