profiles: Simplify video_cards_{i915,i965,intel} masks

Instead of masking them on all the platforms they're not available,
unmask them on the only two platforms they are.

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index df5a829c20c5342abc77700413d98cf1a4f98d1f..675246043faaba2e9e1b8a7e4e4192e953eeb0da 100644 (file)
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -131,7 +131,6 @@ video_cards_ast
 video_cards_chips
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_neomagic
 video_cards_siliconmotion
 video_cards_sis
@@ -141,8 +140,6 @@ video_cards_vesa
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 # llvm is not keyworded

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f3ec77864a34ec92517e5ac7754c3e3ebb8e2bc6..f04f03d0d39fd991b5131e8d84eb3eb6a3a7ad9f 100644 (file)
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -118,6 +118,9 @@
 -input_devices_synaptics
 -input_devices_vmmouse
 -input_devices_wacom
+-video_cards_i915
+-video_cards_i965
+-video_cards_intel
 -video_cards_nvidia
 -video_cards_via
 -video_cards_virtualbox

diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index a6e084acb4a995752a7f13da5e70a426fcab930f..cad602bc98ed761578994a3ac7c9c72f28da6e17 100644 (file)
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -118,7 +118,6 @@ video_cards_chips
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_neomagic
@@ -148,8 +147,6 @@ video_cards_r200
 video_cards_r300
 video_cards_r600
 video_cards_radeonsi
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 93d1dcb4b2f573bd4543e9ba8b1af6108651bf6a..d406d11879be29541a6f71ccf3dd5765df2b9127 100644 (file)
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -199,7 +199,6 @@ video_cards_chips
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_neomagic
@@ -228,8 +227,6 @@ video_cards_r200
 video_cards_r300
 video_cards_r600
 video_cards_radeonsi
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 0b6f0124e882656f58257cd962b677172d243434..2c08a0e989cf45bdc1efd15903be9f8d187498eb 100644 (file)
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -136,6 +136,9 @@ video_cards_newport
 
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
+video_cards_i915
+video_cards_i965
+video_cards_intel
 video_cards_nvidia
 video_cards_via
 video_cards_vmware

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 24baf0c5ab97ba9fe29c5afcd1bcd7ab726403d3..f0164b9ec480f6181e3a213f5ea79382963e8240 100644 (file)
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -218,9 +218,6 @@ video_cards_cirrus
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_i915
-video_cards_i965
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_neomagic

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index a5141ca05f2b3f9f08fd71886bc686bc96036629..5cbc0158573b4d367cfa2fa83cfffcf4a54a7647 100644 (file)
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -147,14 +147,8 @@ video_cards_ast
 video_cards_siliconmotion
 video_cards_sis
 
-# Matt Turner <mattst88@gentoo.org> (02 Jan 2013)
-# Not available on ia64. See bugs 449816, 448606.
-video_cards_intel
-
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 # llvm is not keyworded

diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 53d2b1f6f8bb67457558726d8fa4194e9fd85493..e19450970ae3602fe81319114bb05770663df333 100644 (file)
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -159,8 +159,6 @@ video_cards_r200
 video_cards_r300
 video_cards_r600
 video_cards_radeonsi
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 
@@ -170,7 +168,6 @@ video_cards_apm
 video_cards_ark
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_neomagic
 video_cards_rendition
 video_cards_tga

diff --git a/profiles/arch/nios2/use.mask b/profiles/arch/nios2/use.mask
index d063f2e446ab4e39f24c49ddfccc1bf425bbf075..2397a963421b6cfe3b89fd9e11bad8f1c40edeb3 100644 (file)
--- a/profiles/arch/nios2/use.mask
+++ b/profiles/arch/nios2/use.mask
@@ -143,7 +143,6 @@ video_cards_chips
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_neomagic
@@ -173,8 +172,6 @@ video_cards_r200
 video_cards_r300
 video_cards_r600
 video_cards_radeonsi
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 

diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 60ef03a5a1d5809c149116b7bc3d97f75dee3f84..9718f9d7ea125c5648198069a8b405f5aff5fec3 100644 (file)
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -116,7 +116,6 @@ video_cards_ark
 video_cards_ast
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_neomagic
 video_cards_rendition
 video_cards_siliconmotion
@@ -127,8 +126,6 @@ video_cards_vesa
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 

diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index dbedb8e62b6818f4e8c778c5dcb027f7ad7d4079..1a5e0bf76ed90ff0591c2fd52cec08db77601c51 100644 (file)
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -110,9 +110,6 @@ video_cards_geode
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_i915
-video_cards_i965
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_modesetting

diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index ecf61cc230d6e243412d2fa3e7d54606d0699e23..7fce0522abf358842bcfc75d537338dbb20970e7 100644 (file)
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -92,7 +92,6 @@ video_cards_chips
 video_cards_glint
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_mach64
 video_cards_mga
 video_cards_neomagic
@@ -122,8 +121,6 @@ video_cards_r200
 video_cards_r300
 video_cards_r600
 video_cards_radeonsi
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index b1d68d441bcbdedf66689da7fbb683421cf2d872..516559e0a0e01fb4144b29925b4afdb8832b1f71 100644 (file)
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -216,7 +216,6 @@ video_cards_ark
 video_cards_rendition
 video_cards_chips
 video_cards_apm
-video_cards_intel
 video_cards_nv
 video_cards_vesa
 video_cards_ast
@@ -224,8 +223,6 @@ video_cards_nouveau
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_i915
-video_cards_i965
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 # llvm is not keyworded

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 933a22bc1deac8629373349ded90da357cd6b619..3ababee80a55082c433c7343f06166224c9d9c1f 100644 (file)
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -136,6 +136,9 @@
 -input_devices_synaptics
 -input_devices_vmmouse
 -input_devices_wacom
+-video_cards_i915
+-video_cards_i965
+-video_cards_intel
 -video_cards_nvidia
 -video_cards_vmware
 -video_cards_geode

diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
index a487f3164d22fdce07c3cccc4e8049e1b85cda97..194eec99ed438c6523f560679c541ae441902f6c 100644 (file)
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/use.mask
@@ -26,7 +26,6 @@ video_cards_apm
 video_cards_ark
 video_cards_i128
 video_cards_i740
-video_cards_intel
 video_cards_neomagic
 video_cards_rendition
 video_cards_siliconmotion