summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-05-28 03:48:07 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-05-28 03:48:07 +0000
commite35eecf220d4853a7a3bb215d409807fb2f89762 (patch)
treeab1921e9d464dd96720bd069bb2a34695a09c271 /x11-base/xorg-x11
parentIn stage1 USE=unicode should be set, otherwise libncurses breaks. This affe... (diff)
downloadgentoo-2-e35eecf220d4853a7a3bb215d409807fb2f89762.tar.gz
gentoo-2-e35eecf220d4853a7a3bb215d409807fb2f89762.tar.bz2
gentoo-2-e35eecf220d4853a7a3bb215d409807fb2f89762.zip
(#90672) Add die for combo of USE="sdk -dlloader," pending a fix.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild10
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6d7d95bcaae4..1bd923dffd65 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.400 2005/05/27 06:11:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.401 2005/05/28 03:48:07 spyderous Exp $
+
+ 28 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.99.8.ebuild:
+ (#90672) Add die for combo of USE="sdk -dlloader," pending a fix.
27 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
-xorg-x11-6.8.99.3.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
index d4e7031c7b40..721fe206ae62 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.99.8.ebuild,v 1.7 2005/05/27 06:06:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild,v 1.8 2005/05/28 03:48:07 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -417,6 +417,14 @@ check_use_combos() {
fi
fi
+ # (#90672)
+ if use sdk && ! use dlloader; then
+ MSG="The sdk and -dlloader USE flags are temporarily incompatible and result in a dead build."
+ einfo ${MSG}
+ einfo "See http://bugs.gentoo.org/show_bug.cgi?id=90672."
+ die ${MSG}
+ fi
+
# (#77949)
if use minimal && use doc; then
die "The minimal and doc USE flags are incompatible and result in a dead build."