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.

15 files changed, 9 insertions, 37 deletions

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index df5a829c20c5..675246043faa 100644
--- 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 f3ec77864a34..f04f03d0d39f 100644
--- 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 a6e084acb4a9..cad602bc98ed 100644
--- 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 93d1dcb4b2f5..d406d11879be 100644
--- 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 0b6f0124e882..2c08a0e989cf 100644
--- 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 24baf0c5ab97..f0164b9ec480 100644
--- 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 a5141ca05f2b..5cbc0158573b 100644
--- 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 53d2b1f6f8bb..e19450970ae3 100644
--- 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 d063f2e446ab..2397a963421b 100644
--- 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 60ef03a5a1d5..9718f9d7ea12 100644
--- 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 dbedb8e62b68..1a5e0bf76ed9 100644
--- 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 ecf61cc230d6..7fce0522abf3 100644
--- 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 b1d68d441bcb..516559e0a0e0 100644
--- 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 933a22bc1dea..3ababee80a55 100644
--- 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 a487f3164d22..194eec99ed43 100644
--- 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