[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/ppc32/, profiles/arch/powerpc/ppc64/64ul/, ...

[Matt Turner]

commit:     265f91b3c29acf5212613773ae5cb804268b7097
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 07:31:57 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 07:36:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265f91b3

profiles: Remove tdfx/voodoo

Bug: https://bugs.gentoo.org/679256
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 profiles/arch/alpha/make.defaults              | 2 +-
 profiles/arch/amd64-fbsd/todo/package.use.mask | 3 ---
 profiles/arch/arm/use.mask                     | 2 --
 profiles/arch/arm64/use.mask                   | 2 --
 profiles/arch/base/use.mask                    | 1 -
 profiles/arch/hppa/use.mask                    | 2 --
 profiles/arch/ia64/make.defaults               | 2 +-
 profiles/arch/mips/use.mask                    | 2 --
 profiles/arch/powerpc/ppc32/make.defaults      | 2 +-
 profiles/arch/powerpc/ppc64/64ul/use.mask      | 2 --
 profiles/arch/s390/use.mask                    | 1 -
 profiles/arch/sh/use.mask                      | 2 --
 profiles/arch/sparc/make.defaults              | 2 +-
 profiles/base/use.mask                         | 6 ------
 profiles/default/bsd/package.use.mask          | 4 ++--
 profiles/desc/video_cards.desc                 | 2 --
 profiles/package.mask                          | 2 ++
 17 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index db56fd05843..88a898517d0 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -21,7 +21,7 @@ LIBDIR_alpha="lib"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@g.o>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2007/02/05 - Chris Gianelloni <wolf31o2@g.o>
 # Defaults for audio drivers. These are copied from x86 (minus modems), since

diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 6c38c1f7e44..973ced730ca 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -132,9 +132,6 @@ media-libs/mesa video_cards_vmware
 x11-base/xorg-server glamor wayland
 x11-drivers/xf86-video-ati glamor
 
-# x11-drivers/xf86-video-tdfx
-x11-base/xorg-drivers video_cards_tdfx
-
 # >=sys-devel/binutils-2.22
 sys-devel/llvm gold
 

diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index c55bc7dc78d..b53a31b84fd 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -116,8 +116,6 @@ video_cards_nouveau
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@g.o>
 # Mask more VIDEO_CARDs added with mesa-8.0

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 513ac9b4da9..a3637255455 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -189,8 +189,6 @@ video_cards_mga
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@g.o>
 # Mask more VIDEO_CARDs added with mesa-8.0

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 72fce6c2649..b9c56f8de54 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -116,7 +116,6 @@ oracle
 
 # not keyworded on non-x86 systems
 video_cards_geode
-video_cards_voodoo
 
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index bb5af3a552e..508c4e974bd 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -247,8 +247,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
-video_cards_tdfx
-video_cards_voodoo
 
 # 25 Jul 2005 Guy Martin <gmsoft@g.o>
 # lm_sensors not supported on hppa and ieee1394 not tested

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 0f0509dd773..482b71cda40 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -26,7 +26,7 @@ CHOST_ia64="${CHOST}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@g.o>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2006/12/23 - Diego Pettenò <flameeyes@g.o>
 # Defaults for audio drivers - Took from x86 profile

diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index f0d708c5b6f..566152cb530 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -127,7 +127,6 @@ dri
 
 # Stephen P. Becker <geoman@g.o>
 # more modular X stuff
-video_cards_tdfx
 video_cards_mga
 video_cards_nouveau
 video_cards_nv
@@ -141,7 +140,6 @@ input_devices_wacom
 input_devices_joystick
 video_cards_glint
 video_cards_nvidia
-video_cards_voodoo
 
 # Matt Turner <mattst88@g.o>
 # Mask more VIDEO_CARDs added with mesa-8.0

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 418e2b90851..0db98cc5fb7 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -15,7 +15,7 @@ FCFLAGS="${CFLAGS}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@g.o>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2006/12/06 - Diego Pettenò <flameeyes@g.o>
 # Defaults for PowerPC sound driver

diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index d21cce270a2..1ecc38c7b29 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -43,8 +43,6 @@ dvb
 # 2006/03/20 - Donnie Berkholz <dberkholz@g.o>
 # Modular X: mask for architectures on which they aren't available
 video_cards_glint
-video_cards_tdfx
-video_cards_voodoo
 # llvm is not keyworded
 video_cards_radeonsi
 

diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 7754e3eb7c8..04e1680cc27 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -113,7 +113,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
-video_cards_tdfx
 
 # Chí-Thanh Christopher Nguyễn <chithanh@g.o> (22 Aug 2013)
 # virtual/opencl is not keyworded

diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index a66f76c5743..02c35f70154 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -91,8 +91,6 @@ video_cards_nouveau
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@g.o>
 # Mask more VIDEO_CARDs added with mesa-8.0

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 32ca3073612..f29dad7aaaf 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -37,7 +37,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 
 # 2006/10/05 - Gustavo Zacarias <gustavoz@g.o>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga r128 radeon"
 
 # Sergei Trofimovich <slyfox@g.o> (24 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index ac83c1441e7..e3a5778afb9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,12 +4,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Matt Turner <mattst88@g.o> (02 Mar 2019)
-# For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
-# Bug #679256
-video_cards_tdfx
-video_cards_voodoo
-
 # Brian Evans <grknight@g.o> (11 Jan 2019)
 # Mask PHP 7.0 target as EOL
 php_targets_php7-0

diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index f29c575e26d..0d2328c5a62 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -84,8 +84,8 @@ media-libs/gst-plugins-base gbm
 # udisks is linux only (for now?)
 gnome-base/gvfs udisks
 
-# joystick and video_cards_tdfx useflag are linux only #477750
-media-video/mplayer joystick video_cards_tdfx
+# joystick useflag is linux only #477750
+media-video/mplayer joystick
 
 # linux only
 media-libs/opencv ieee1394 cuda

diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index 8229151128a..ab9ece95a2c 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -32,7 +32,6 @@ r600 - VIDEO_CARDS setting to build only r600, r700, Evergreen and Northern Isla
 radeon - VIDEO_CARDS setting to build driver for ATI radeon video cards
 radeonsi - VIDEO_CARDS setting to build only Southern Islands based chips code for radeon
 siliconmotion - VIDEO_CARDS setting to build driver for siliconmotion video cards
-tdfx - VIDEO_CARDS setting to build driver for tdfx video cards
 tegra - VIDEO_CARDS setting to build driver for tegra video cards
 vc4 - VIDEO_CARDS setting to build driver for vc4 video cards
 vesa - VIDEO_CARDS setting to build driver for vesa video cards
@@ -41,4 +40,3 @@ virgl - VIDEO_CARDS setting to build driver for virgil (virtual 3D GPU)
 virtualbox - VIDEO_CARDS setting to build driver for virtualbox emulation
 vivante - VIDEO_CARDS setting to build etnaviv driver for vivante video cards
 vmware - VIDEO_CARDS setting to build driver for vmware video cards
-voodoo - VIDEO_CARDS setting to build driver for voodoo video cards

diff --git a/profiles/package.mask b/profiles/package.mask
index 3d27dd78c3d..773b5fd158b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -416,9 +416,11 @@ x11-drivers/xf86-video-suncg6
 x11-drivers/xf86-video-sunffb
 x11-drivers/xf86-video-sunleo
 x11-drivers/xf86-video-suntcx
+x11-drivers/xf86-video-tdfx
 x11-drivers/xf86-video-tga
 x11-drivers/xf86-video-trident
 x11-drivers/xf86-video-tseng
+x11-drivers/xf86-video-voodoo
 
 # Michał Górny <mgorny@g.o> (16 Mar 2019)
 # The current Gentoo version of Nessus is from 2006 (!).  It does