From b7a2c67c1e633870329786adbb9ae9bf551f8a8e Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 8 May 2018 14:13:58 -0700 Subject: [PATCH] profiles: Simplify video_cards_vesa/video_cards_via use masks These are only available on x86/amd64, so we don't need to clutter up all arch profiles with them. --- profiles/arch/alpha/use.mask | 3 --- profiles/arch/amd64/use.mask | 1 + profiles/arch/arm/use.mask | 2 -- profiles/arch/arm64/use.mask | 2 -- profiles/arch/base/use.mask | 1 + profiles/arch/hppa/use.mask | 1 - profiles/arch/mips/use.mask | 4 ---- profiles/arch/powerpc/use.mask | 4 ---- profiles/arch/s390/use.mask | 1 - profiles/arch/sh/use.mask | 2 -- profiles/arch/sparc/use.mask | 1 - profiles/arch/x86/use.mask | 1 + profiles/hardened/linux/powerpc/ppc64/use.mask | 5 ----- 13 files changed, 3 insertions(+), 25 deletions(-) diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask index b9851f4fbe6a..a1b7280cd611 100644 --- a/profiles/arch/alpha/use.mask +++ b/profiles/arch/alpha/use.mask @@ -121,9 +121,6 @@ vpopmail # We don't have any virtual/mpi (bug 111807) mpi -# Modular X: mask non-alpha cards -video_cards_vesa - # Matt Turner # llvm is not keyworded video_cards_amdgpu diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index f344a7da1c55..307f4ea24127 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -121,6 +121,7 @@ -video_cards_intel -video_cards_nvidia -video_cards_siliconmotion +-video_cards_vesa -video_cards_via -video_cards_virtualbox -video_cards_vmware diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask index ab0c94fb997e..b5359fbb5015 100644 --- a/profiles/arch/arm/use.mask +++ b/profiles/arch/arm/use.mask @@ -110,8 +110,6 @@ video_cards_nv video_cards_r128 video_cards_radeon video_cards_tdfx -video_cards_vesa -video_cards_via video_cards_voodoo # Matt Turner diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask index d296ac03f110..701fa0507204 100644 --- a/profiles/arch/arm64/use.mask +++ b/profiles/arch/arm64/use.mask @@ -211,8 +211,6 @@ video_cards_nv video_cards_r128 video_cards_radeon video_cards_tdfx -video_cards_vesa -video_cards_via video_cards_voodoo # Matt Turner diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 7545b9fc9f77..7b56f996c3ac 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -129,6 +129,7 @@ video_cards_i915 video_cards_i965 video_cards_intel video_cards_nvidia +video_cards_vesa video_cards_via video_cards_vmware video_cards_virtualbox diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask index 3639d4ee5d8b..157329615fb7 100644 --- a/profiles/arch/hppa/use.mask +++ b/profiles/arch/hppa/use.mask @@ -234,7 +234,6 @@ video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_tdfx -video_cards_vesa video_cards_voodoo # 25 Jul 2005 Guy Martin diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask index de834a719094..16cf105d8adf 100644 --- a/profiles/arch/mips/use.mask +++ b/profiles/arch/mips/use.mask @@ -152,10 +152,6 @@ video_cards_r300 video_cards_r600 video_cards_radeonsi -# 2006/02/05 - Donnie Berkholz -# Modular X: mask for architectures on which they aren't available -video_cards_vesa - # Diego Pettenò # Until xine-lib's keywording can be maintained, please leave it masked. xine diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask index fc28c68580d2..9500eba21f4a 100644 --- a/profiles/arch/powerpc/use.mask +++ b/profiles/arch/powerpc/use.mask @@ -112,10 +112,6 @@ lcd_devices_stv5730 # Both lcd_devices_t6963 -# 2006/08/18 - Donnie Berkholz -# Modular X: mask for architectures on which they aren't available -video_cards_vesa - # Intel Integrated Primitive (sci-libs/ipp) support ipp diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask index d539fc4b5686..bf9dbcfa2b33 100644 --- a/profiles/arch/s390/use.mask +++ b/profiles/arch/s390/use.mask @@ -106,7 +106,6 @@ video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_tdfx -video_cards_vesa # Chí-Thanh Christopher Nguyễn (22 Aug 2013) # virtual/opencl is not keyworded diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask index e95b7df40d7a..648703d97228 100644 --- a/profiles/arch/sh/use.mask +++ b/profiles/arch/sh/use.mask @@ -89,8 +89,6 @@ video_cards_nv video_cards_r128 video_cards_radeon video_cards_tdfx -video_cards_vesa -video_cards_via video_cards_voodoo # Matt Turner diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index df91e130720f..b67efceb34f9 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -184,7 +184,6 @@ hdf5 # 2006/02/05 - Donnie Berkholz # Modular X: mask for architectures on which they aren't available video_cards_nv -video_cards_vesa video_cards_nouveau # Matt Turner diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask index 61982cc07f41..348be1819f00 100644 --- a/profiles/arch/x86/use.mask +++ b/profiles/arch/x86/use.mask @@ -138,6 +138,7 @@ -video_cards_siliconmotion -video_cards_vmware -video_cards_geode +-video_cards_vesa -video_cards_via -video_cards_virtualbox -video_cards_qxl diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask index 0bef9ecd3c13..3abb7f43138f 100644 --- a/profiles/hardened/linux/powerpc/ppc64/use.mask +++ b/profiles/hardened/linux/powerpc/ppc64/use.mask @@ -19,11 +19,6 @@ portaudio mozilla seamonkey -# 2006/03/20 - Donnie Berkholz -# Modular X: mask for architectures on which they aren't available -video_cards_vesa -video_cards_via - # Masked p2p for bug #155302 p2p -- 2.26.2