# 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.136 2004/10/11 07:53:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.137 2004/10/11 07:57:24 spyderous Exp $
+
+ 11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r1.ebuild:
+ Disallow USE="dmx doc" (#63548).
11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.0-r1.ebuild:
-MD5 ba829f0d6af7f509c6d5e73edbd519ca ChangeLog 30466
+MD5 70eda61a2abb9e09074f3ef98c8e63bb ChangeLog 30585
MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
MD5 c32f9bc44ffd10b49297b4898097096b xorg-x11-6.7.0-r2.ebuild 38142
-MD5 1f38931397ace3460858a03cab0982ed xorg-x11-6.8.0-r1.ebuild 41346
+MD5 6df9074457d3fe8cef32225bc965c2a4 xorg-x11-6.8.0-r1.ebuild 41471
MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r1 906
# 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-r1.ebuild,v 1.16 2004/10/11 07:53:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.17 2004/10/11 07:57:24 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
fi
fi
+ if use dmx && use doc
+ then
+ die "The dmx and doc USE flags are temporarily incompatible and result in a dead build."
+ fi
+
# on amd64 we need /usr/X11R6/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.