From: Donnie Berkholz Date: Fri, 7 Jan 2005 22:27:12 +0000 (+0000) Subject: (#76936) USE=opengl and USE=xv are mutually interdependent -- not only one way. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=648a649eea818d52c16dac08de00dc7cfc9a6269;p=gentoo.git (#76936) USE=opengl and USE=xv are mutually interdependent -- not only one way. --- diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 3b7368cc736b..0d13254f7e43 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.260 2005/01/06 05:52:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.261 2005/01/07 22:27:12 spyderous Exp $ + + 07 Jan 2005; Donnie Berkholz ; + xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: + (#76936) USE=opengl and USE=xv are mutually interdependent -- not only one way. 05 Jan 2005; Donnie Berkholz ; xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 56f01002af81..001ff0f81889 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,11 +1,11 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 6c24c8a3aa69cebf79e8633555073c36 xorg-x11-6.7.0-r2.ebuild 38088 MD5 d548e768ef760adbe7776ac667dbda13 xorg-x11-6.8.0-r1.ebuild 41337 -MD5 35eda076819dcf7b115cb0094eee581f ChangeLog 63486 -MD5 59df6af7d2808802bac658847b136ee9 xorg-x11-6.8.0-r4.ebuild 50722 +MD5 4fc52b6f3dadd7198bee46d4074df7d8 ChangeLog 63679 +MD5 023d40db1a9bc84a3f8c213d50801c52 xorg-x11-6.8.0-r4.ebuild 50930 MD5 6f04e427204ce7edb6997f355147f17f xorg-x11-6.7.0-r3.ebuild 38106 MD5 cec0cbc2cc6f6350b15b8edd3763635f xorg-x11-6.8.0-r3.ebuild 39939 -MD5 b2db0db4cb3ac4d6dfb268b4b517025a xorg-x11-6.8.1.901.ebuild 50723 +MD5 c66b45499eb7b6d59eba047935f0e8d9 xorg-x11-6.8.1.901.ebuild 50931 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index 0f4600314859..b7a0ac48f6ad 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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.0-r4.ebuild,v 1.40 2005/01/06 05:52:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.41 2005/01/07 22:27:12 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -558,6 +558,12 @@ check_use_combos() { eerror "The xv USE flag currently requires the opengl flag." die "This is a known bug. Do not report it." fi + + if use opengl && ! use xv; then + eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936" + eerror "The opengl USE flag currently requires the xv flag." + die "This is a known bug. Do not report it." + fi } ################ diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild index bd3c93e1f997..818636dddd9b 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901.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.1.901.ebuild,v 1.13 2005/01/06 05:52:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild,v 1.14 2005/01/07 22:27:12 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -559,6 +559,12 @@ check_use_combos() { eerror "The xv USE flag currently requires the opengl flag." die "This is a known bug. Do not report it." fi + + if use opengl && ! use xv; then + eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936" + eerror "The opengl USE flag currently requires the xv flag." + die "This is a known bug. Do not report it." + fi } ################