From 8ff5e43fdd27a8b256879a078f2c695b7662c68e Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Wed, 20 Oct 2004 02:43:42 +0000 Subject: [PATCH] USE=dri requires USE=glx. --- x11-base/xorg-x11/ChangeLog | 6 +++++- x11-base/xorg-x11/Manifest | 4 ++-- x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 6 +++++- 3 files changed, 12 insertions(+), 4 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 ; + xorg-x11-6.8.0-r2.ebuild: + USE=dri requires USE=glx. 19 Oct 2004; Donnie Berkholz ; xorg-x11-6.8.0-r2.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index dec420ab9e9a..643020911d11 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 -MD5 ce844f3030f34c356263eab7e1196ed2 xorg-x11-6.8.0-r2.ebuild 43712 +MD5 937920fe48d77e65d4fe48ac4579517a xorg-x11-6.8.0-r2.ebuild 43796 MD5 ca34ddd369d94ea86b0774e029f54efb xorg-x11-6.7.0-r2.ebuild 38072 MD5 c81b82b9a07e0975156358918886607e xorg-x11-6.8.0-r1.ebuild 41319 -MD5 1ef6f0ea2ca348c7bccd6a8f91e7d287 ChangeLog 37195 +MD5 1cb9ca65b018a6f68f8ccf7c5f9b357b ChangeLog 37307 MD5 5f6772219f532c3baf3fb3ceecf1ab65 files/digest-xorg-x11-6.8.0-r2 906 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 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. -- 2.26.2