USE=xv wrongly requires USE=opengl, but this is a bug in the source (#67996). Forcing...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8d416618255bc637a4bef074b2309465c1d99426..ab01863fe6dbb402314536b260174e0efefe0373 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.180 2004/10/29 06:20:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.181 2004/10/29 06:27:22 spyderous Exp $
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  USE=xv wrongly requires USE=opengl, but this is a bug in the source
+  (#67996). Forcing them to be used together until upstream fixes it.
 
   28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 5ee754e91d8153bf0041ccea1506935ea2b6c410..b83a4582ae81e8f32dfe661bb2a19cf5e7066d4f 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
-MD5 880834d3fd0484c1885af0133fe93872 ChangeLog 38878
+MD5 4f2698752e8f35262ebf1f567b418d25 ChangeLog 39102
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 60424645dd9b3195430fcec726eef6a4 xorg-x11-6.8.0-r2.ebuild 43837
+MD5 b9c3c5842f77a0fe5199d94253124cce xorg-x11-6.8.0-r2.ebuild 44045
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 4948d68fce0cc80c309f112474e37303 files/digest-xorg-x11-6.8.0-r2 906

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 36d560f537eb43dc9e3b85152b8a3bc5f6382a58..8e417a704bae0da68f8c2bedad3d8b6d3ce64448 100644 (file)
--- 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.35 2004/10/29 06:20:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.36 2004/10/29 06:27:22 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -228,6 +228,12 @@ pkg_setup() {
                die "The dri USE flag requires the opengl flag."
        fi
 
+       if use xv && ! use opengl; then
+               eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996"
+               eerror "The xv USE flag currently requires the opengl flag."
+               die "This is a known bug. Do not report it."
+       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.