summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-10-20 02:43:42 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-10-20 02:43:42 +0000
commit7eb3526002cbfa6d910914d42dee09398e527ef6 (patch)
treeb368933cf3909a0d205a9c7b1217c1773035b41a /x11-base
parentJust call unpack once for each. (diff)
downloadgentoo-2-7eb3526002cbfa6d910914d42dee09398e527ef6.tar.gz
gentoo-2-7eb3526002cbfa6d910914d42dee09398e527ef6.tar.bz2
gentoo-2-7eb3526002cbfa6d910914d42dee09398e527ef6.zip
USE=dri requires USE=glx.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 9b86fd214e79..bd6e7a32ff31 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.169 2004/10/19 08:49:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.170 2004/10/20 02:43:42 spyderous Exp $
+
+ 19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r2.ebuild:
+ USE=dri requires USE=glx.
19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.0-r2.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index 884f1fa8df9d..bce898604921 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.26 2004/10/19 08:49:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.27 2004/10/20 02:43:42 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -224,6 +224,10 @@ pkg_setup() {
die "The dmx and doc USE flags are temporarily incompatible and result in a dead build."
fi
+ if use dri && ! use glx; then
+ die "The dri USE flag requires the glx flag."
+ fi
+
# on amd64 we need /usr/lib64/X11/locale/lib to be a symlink
# created by the emul lib ebuild in order for adobe acrobat, staroffice,
# and a few other apps to work.