From 0077f66c38d14cf7ed58131f5114f6493e7e389d Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Sat, 17 Jun 2006 15:21:59 +0000 Subject: [PATCH] Drop nvidia and fglrx flags for now and block all nvidia-glx and ati-drivers versions since neither of the binary drivers are supported currently. (Jakub Moc, bug #136788) Package-Manager: portage-2.1.1_pre1 --- x11-base/xorg-server/ChangeLog | 8 +++++++- x11-base/xorg-server/Manifest | 16 ++++++++-------- x11-base/xorg-server/xorg-server-1.1.0.ebuild | 14 +++++++------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index fe2c1c954bc4..b77431669771 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.124 2006/06/11 18:48:39 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.125 2006/06/17 15:21:59 joshuabaergen Exp $ + + 17 Jun 2006; Joshua Baergen + xorg-server-1.1.0.ebuild: + Drop nvidia and fglrx flags for now and block all nvidia-glx and ati-drivers + versions since neither of the binary drivers are supported currently. + (Jakub Moc, bug #136788) *xorg-server-1.0.2-r5 (11 Jun 2006) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index bd2f2db53ff9..e174a07cdb9f 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -67,14 +67,14 @@ EBUILD xorg-server-1.0.2-r5.ebuild 6111 RMD160 7fca485e56158fe1963c9d9fcbd1be6cd MD5 af4853722d3b94562e537df206d70c75 xorg-server-1.0.2-r5.ebuild 6111 RMD160 7fca485e56158fe1963c9d9fcbd1be6cdfdaa31d xorg-server-1.0.2-r5.ebuild 6111 SHA256 25aa08c324c14972d183eac81791849222be6d8536445c7eec4efaf53307a9ad xorg-server-1.0.2-r5.ebuild 6111 -EBUILD xorg-server-1.1.0.ebuild 22919 RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 SHA1 3daa71393f914219f50c0fc24f1a2f376567792d SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c -MD5 008e008ed19b4a395fdedabc70fc6083 xorg-server-1.1.0.ebuild 22919 -RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 xorg-server-1.1.0.ebuild 22919 -SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c xorg-server-1.1.0.ebuild 22919 -MISC ChangeLog 26818 RMD160 3f089d605cbded7c1c711865fe401280423af3d2 SHA1 1edf82cb4a45b23150535fa4c914e7f3853e33aa SHA256 2e0a026748ff227d49a6de5066dc802a8e29311783bc807f77f3a6e7093af768 -MD5 ebb9eca1a77d1413879754de6b0c2a01 ChangeLog 26818 -RMD160 3f089d605cbded7c1c711865fe401280423af3d2 ChangeLog 26818 -SHA256 2e0a026748ff227d49a6de5066dc802a8e29311783bc807f77f3a6e7093af768 ChangeLog 26818 +EBUILD xorg-server-1.1.0.ebuild 22871 RMD160 39dc98ee0a4fe07adb1756e855494818ff06110f SHA1 fc041ce39ed0b04e574daa07db87827649afeae4 SHA256 db72d48673bce5bc04a8e80e824c118e10e9c8dd7b68d3b1aff0cbfa47cab7c7 +MD5 253948832ffb52bdf5a87bfa72bb126f xorg-server-1.1.0.ebuild 22871 +RMD160 39dc98ee0a4fe07adb1756e855494818ff06110f xorg-server-1.1.0.ebuild 22871 +SHA256 db72d48673bce5bc04a8e80e824c118e10e9c8dd7b68d3b1aff0cbfa47cab7c7 xorg-server-1.1.0.ebuild 22871 +MISC ChangeLog 27082 RMD160 1593cff087e1c43f5f09047e70b149041a43a245 SHA1 69edc71950b62e2b4dacf907993b4f1a6fdaa623 SHA256 9ac920f2e1196b94e118ec5eb7c227c220a5adb0f298787e74f176a0f411396a +MD5 4691cbb78315db1ed8ffbe98752b6b2a ChangeLog 27082 +RMD160 1593cff087e1c43f5f09047e70b149041a43a245 ChangeLog 27082 +SHA256 9ac920f2e1196b94e118ec5eb7c227c220a5adb0f298787e74f176a0f411396a ChangeLog 27082 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-base/xorg-server/xorg-server-1.1.0.ebuild b/x11-base/xorg-server/xorg-server-1.1.0.ebuild index 027844bf8229..c33507b58b0d 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0.ebuild,v 1.3 2006/06/04 18:51:49 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0.ebuild,v 1.4 2006/06/17 15:21:59 joshuabaergen Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -101,10 +101,10 @@ IUSE_VIDEO_CARDS=" video_cards_vga video_cards_via video_cards_vmware - video_cards_voodoo + video_cards_voodoo" - video_cards_nvidia - video_cards_fglrx" +# video_cards_nvidia +# video_cards_fglrx" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -142,7 +142,9 @@ RDEPEND="x11-libs/libXfont x11-libs/libXres ) >=x11-libs/libxkbui-1.0.2 x11-libs/liblbxutil - kdrive? ( sdl? ( media-libs/libsdl ) )" + kdrive? ( sdl? ( media-libs/libsdl ) ) + !media-video/nvidia-glx + !x11-drivers/ati-drivers" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent # Xpm is dmx- and xorgcfg-dependent, pulls in Xt @@ -322,8 +324,6 @@ PDEPEND=" video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - video_cards_nvidia? ( media-video/nvidia-glx ) - video_cards_fglrx? ( x11-drivers/ati-drivers ) ) ( >=x11-drivers/xf86-video-dummy-0.2.0 -- 2.26.2