diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-05-24 22:50:02 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-05-24 22:50:02 +0000 |
| commit | 8cc77af0798a141aa86cabdc7ece00d444faa4fd (patch) | |
| tree | bee55e498a3efcab7303a647aa2a30b6c2038d10 /x11-base/xorg-x11 | |
| parent | Fixed the dm-crypt check as per bug 89142 (diff) | |
| download | historical-8cc77af0798a141aa86cabdc7ece00d444faa4fd.tar.gz historical-8cc77af0798a141aa86cabdc7ece00d444faa4fd.tar.bz2 historical-8cc77af0798a141aa86cabdc7ece00d444faa4fd.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/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild | 9 |
3 files changed, 9 insertions, 10 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/Manifest b/x11-base/xorg-x11/Manifest index 032bddc59961..dab5d5158fc1 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 2a9834518373d30105bf3deba9f2624e xorg-x11-6.8.99.3.ebuild 60101 MD5 97dbd5e405b50b53f3ada3f612e5e883 xorg-x11-6.8.2-r2.ebuild 60309 -MD5 5262173b3f7e944c109ab5dd96faa1c5 ChangeLog 93756 -MD5 806cc0da03d0f355723a162b58b887cb xorg-x11-6.8.99.8.ebuild 60657 +MD5 1cf616479c9f073f37b244d1a004646d ChangeLog 93916 +MD5 05f235f7fe1506c60e89df7af62eeb2d xorg-x11-6.8.99.8.ebuild 60500 MD5 fb5fe55f00e3567aeb6ea6d4465fc62b xorg-x11-6.8.2-r1.ebuild 59275 MD5 8b76b2dd6d719ed8a204fddccc3d3481 xorg-x11-6.8.99.5.ebuild 60280 MD5 a98e64cce8a02182077d2a3705073df3 files/digest-xorg-x11-6.8.99.3 514 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 |