diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-05-24 22:50:02 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-05-24 22:50:02 +0000 |
| commit | 095d7bbb0f1d23b7cc479ec17b0b4a9fb2878da1 (patch) | |
| tree | e8fb52857dba9ebe2071117b29e60bf3f2b59273 /x11-base/xorg-x11 | |
| parent | Fixed the dm-crypt check as per bug 89142 (diff) | |
| download | gentoo-2-095d7bbb0f1d23b7cc479ec17b0b4a9fb2878da1.tar.gz gentoo-2-095d7bbb0f1d23b7cc479ec17b0b4a9fb2878da1.tar.bz2 gentoo-2-095d7bbb0f1d23b7cc479ec17b0b4a9fb2878da1.zip | |
(#93856) Remove duplicated statement that checked for invalid USE combos.
Diffstat (limited to 'x11-base/xorg-x11')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 16ff26f543e2..264e53e7c4f7 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.396 2005/05/24 19:36:50 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.397 2005/05/24 22:50:02 spyderous Exp $ + + 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.99.8.ebuild: + (#93856) Remove duplicated statement that checked for invalid USE combos. 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.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 baa6042b3ee2..d53039fc618c 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.4 2005/05/24 19:36:50 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild,v 1.5 2005/05/24 22:50:02 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -419,12 +419,7 @@ check_use_combos() { # (#77949) if use minimal && use doc; then - die "The minimal and doc USE flags are temporarily incompatible and result in a dead build." - fi - - # (#77949) - if use minimal && use doc; then - die "The minimal and doc USE flags are temporarily incompatible and result in a dead build." + die "The minimal and doc USE flags are incompatible and result in a dead build." fi if use xv && ! use opengl; then |