Fix up VIDEO_CARDS for mips, they don't want ati, mga, sisusb.

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index bd5438086a26488e7a9f4fd030c02e34d03c8b6a..bc3c243b62c868b257374685f2f01940cfde3259 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2006/06/20 16:37:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.127 2006/06/21 02:40:43 spyderous Exp $
+
+  21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild:
+  Fix up VIDEO_CARDS for mips, they don't want ati, mga, sisusb.
 
 *xorg-server-1.1.0-r1 (20 Jun 2006)
 *xorg-server-1.0.2-r6 (20 Jun 2006)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 198c2652570615505dd97e412357df663148a84e..1c425f208de7cd31dddc7847b067bcac3d7f48fd 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -71,14 +71,14 @@ EBUILD xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb
 MD5 65ebbfe3b11ecbc256d305d02aa215e7 xorg-server-1.0.2-r6.ebuild 6140
 RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e xorg-server-1.0.2-r6.ebuild 6140
 SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c xorg-server-1.0.2-r6.ebuild 6140
-EBUILD xorg-server-1.1.0-r1.ebuild 22900 RMD160 6f80ab60ee1166d22247a4d22ebc131d65f817a4 SHA1 1181a682dd2deb2c3c7aa034a64371df43b22b95 SHA256 830c883309262f6725a8282594829d766e5b3d3b3cbf963f891f3161bb54073c
-MD5 706904661a0ce12e163cb32a2e8edde9 xorg-server-1.1.0-r1.ebuild 22900
-RMD160 6f80ab60ee1166d22247a4d22ebc131d65f817a4 xorg-server-1.1.0-r1.ebuild 22900
-SHA256 830c883309262f6725a8282594829d766e5b3d3b3cbf963f891f3161bb54073c xorg-server-1.1.0-r1.ebuild 22900
-MISC ChangeLog 27716 RMD160 b3ebdb150128d32f3fcdc424785a4c7924c307ab SHA1 8d7f4df2ed9757af2f7bdb6707073757fc59b016 SHA256 4520304c8285b65401f4d6c354aa45ac0eb8d2f05be65983af60be9e3997090e
-MD5 08fc52daecd0f5d9833ed5100a66b8bc ChangeLog 27716
-RMD160 b3ebdb150128d32f3fcdc424785a4c7924c307ab ChangeLog 27716
-SHA256 4520304c8285b65401f4d6c354aa45ac0eb8d2f05be65983af60be9e3997090e ChangeLog 27716
+EBUILD xorg-server-1.1.0-r1.ebuild 23755 RMD160 0bce683c6185e542ce46b02621dd01390bc58fb0 SHA1 0fc3d04a110f61f4940a23ca4c662a83dd4f4c09 SHA256 0e8a083741af91ed97db40d41b0b88083f74aaa18e482a76b65f79c774a5e688
+MD5 d01a268772b5a7ad75855392e1e297f6 xorg-server-1.1.0-r1.ebuild 23755
+RMD160 0bce683c6185e542ce46b02621dd01390bc58fb0 xorg-server-1.1.0-r1.ebuild 23755
+SHA256 0e8a083741af91ed97db40d41b0b88083f74aaa18e482a76b65f79c774a5e688 xorg-server-1.1.0-r1.ebuild 23755
+MISC ChangeLog 27868 RMD160 7334237dd6f089102ef2d975a066d780d2210a7b SHA1 15f9f3731a54e7c968cbc5867a28dacfd638872f SHA256 f23c724d1d1411a196fbca6196ee1ca842749cc3f85e0e66df0aeb505e25b766
+MD5 8b31329d463cf0be5ae757742a5d3363 ChangeLog 27868
+RMD160 7334237dd6f089102ef2d975a066d780d2210a7b ChangeLog 27868
+SHA256 f23c724d1d1411a196fbca6196ee1ca842749cc3f85e0e66df0aeb505e25b766 ChangeLog 27868
 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-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index 5d394d4fd86021ecfbbf4d1d3cb74e18942d2cda..d5c19e8aa591dee0ac0dc6366d905edb58b8ecb3 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.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-r1.ebuild,v 1.1 2006/06/20 16:37:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.2 2006/06/21 02:40:43 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -331,35 +331,36 @@ PDEPEND="
                                >=x11-drivers/xf86-video-fbdev-0.2.0
 
                                !hppa? (
-                                       >=x11-drivers/xf86-video-ati-6.6.0
-                                       >=x11-drivers/xf86-video-mga-1.4.1
-
-                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
                                )
 
                                3dfx? ( >=media-libs/glide-v3-3.10 )
 
                                alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0
+                                       >=x11-drivers/xf86-video-ati-6.6.0
                                        >=x11-drivers/xf86-video-glint-1.1.1
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
                                        >=x11-drivers/xf86-video-rendition-4.1.0
                                        >=x11-drivers/xf86-video-s3-0.4.1
                                        >=x11-drivers/xf86-video-s3virge-1.9.1
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-siliconmotion-1.4.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-tga-1.1.0
                                        >=x11-drivers/xf86-video-vga-4.1.0
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
                                amd64? ( >=x11-drivers/xf86-video-apm-1.1.1
                                        >=x11-drivers/xf86-video-ark-0.6.0
+                                       >=x11-drivers/xf86-video-ati-6.6.0
                                        >=x11-drivers/xf86-video-chips-1.1.1
                                        >=x11-drivers/xf86-video-cirrus-1.1.0
                                        >=x11-drivers/xf86-video-cyrix-1.1.0
                                        >=x11-drivers/xf86-video-glint-1.1.1
                                        >=x11-drivers/xf86-video-i128-1.2.0
                                        >=x11-drivers/xf86-video-i810-1.6.0
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-neomagic-1.1.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
                                        >=x11-drivers/xf86-video-rendition-4.1.0
@@ -368,6 +369,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-siliconmotion-1.4.1
                                        >=x11-drivers/xf86-video-sis-0.9.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-tga-1.1.0
                                        >=x11-drivers/xf86-video-trident-1.2.1
@@ -377,19 +379,23 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-via-0.2.1
                                        >=x11-drivers/xf86-video-vmware-10.13.0
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
-                               arm? ( >=x11-drivers/xf86-video-chips-1.1.1
+                               arm? ( >=x11-drivers/xf86-video-ati-6.6.0
+                                       >=x11-drivers/xf86-video-chips-1.1.1
                                        >=x11-drivers/xf86-video-glint-1.1.1
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
                                        >=x11-drivers/xf86-video-s3-0.4.1
                                        >=x11-drivers/xf86-video-s3virge-1.9.1
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-sis-0.9.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-trident-1.2.1
                                        >=x11-drivers/xf86-video-vga-4.1.0
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
                                ia64? ( >=x11-drivers/xf86-video-apm-1.1.1
                                        >=x11-drivers/xf86-video-ark-0.6.0
+                                       >=x11-drivers/xf86-video-ati-6.6.0
                                        >=x11-drivers/xf86-video-chips-1.1.1
                                        >=x11-drivers/xf86-video-cirrus-1.1.0
                                        >=x11-drivers/xf86-video-cyrix-1.1.0
@@ -398,6 +404,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-i740-1.1.0
                                        >=x11-drivers/xf86-video-i810-1.6.0
                                        >=x11-drivers/xf86-video-imstt-1.1.0
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-neomagic-1.1.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
                                        >=x11-drivers/xf86-video-rendition-4.1.0
@@ -406,6 +413,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-siliconmotion-1.4.1
                                        >=x11-drivers/xf86-video-sis-0.9.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-tga-1.1.0
                                        >=x11-drivers/xf86-video-trident-1.2.1
@@ -415,22 +423,30 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-via-0.2.1
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
                                mips? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-                               ppc? ( >=x11-drivers/xf86-video-chips-1.1.1
+                               ppc? ( >=x11-drivers/xf86-video-ati-6.6.0
+                                       >=x11-drivers/xf86-video-chips-1.1.1
                                        >=x11-drivers/xf86-video-glint-1.1.1
                                        >=x11-drivers/xf86-video-imstt-1.1.0
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
                                        >=x11-drivers/xf86-video-s3-0.4.1
                                        >=x11-drivers/xf86-video-s3virge-1.9.1
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-sis-0.9.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-trident-1.2.1
                                        >=x11-drivers/xf86-video-vga-4.1.0
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
-                               ppc64? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-                               sparc? (
+                               ppc64? ( >=x11-drivers/xf86-video-ati-6.6.0
+                                       >=x11-drivers/xf86-video-mga-1.4.1
+                                       >=x11-drivers/xf86-video-nv-1.1.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1 )
+                               sparc? ( >=x11-drivers/xf86-video-ati-6.6.0
                                        >=x11-drivers/xf86-video-glint-1.1.1
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-savage-2.1.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-sunbw2-1.1.0
                                        >=x11-drivers/xf86-video-suncg14-1.1.0
                                        >=x11-drivers/xf86-video-suncg3-1.1.0
@@ -444,6 +460,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-voodoo-1.1.0 )
                                x86? ( >=x11-drivers/xf86-video-apm-1.1.1
                                        >=x11-drivers/xf86-video-ark-0.6.0
+                                       >=x11-drivers/xf86-video-ati-6.6.0
                                        >=x11-drivers/xf86-video-chips-1.1.1
                                        >=x11-drivers/xf86-video-cirrus-1.1.0
                                        >=x11-drivers/xf86-video-cyrix-1.1.0
@@ -452,6 +469,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-i740-1.1.0
                                        >=x11-drivers/xf86-video-i810-1.6.0
                                        >=x11-drivers/xf86-video-imstt-1.1.0
+                                       >=x11-drivers/xf86-video-mga-1.4.1
                                        >=x11-drivers/xf86-video-neomagic-1.1.1
                                        >=x11-drivers/xf86-video-nsc-2.8.1
                                        >=x11-drivers/xf86-video-nv-1.1.1
@@ -461,6 +479,7 @@ PDEPEND="
                                        >=x11-drivers/xf86-video-savage-2.1.1
                                        >=x11-drivers/xf86-video-siliconmotion-1.4.1
                                        >=x11-drivers/xf86-video-sis-0.9.1
+                                       >=x11-drivers/xf86-video-sisusb-0.8.1
                                        >=x11-drivers/xf86-video-tdfx-1.2.1
                                        >=x11-drivers/xf86-video-tga-1.1.0
                                        >=x11-drivers/xf86-video-trident-1.2.1