Profiles: move x86-only video cards to x86 profiles

4 files changed, 14 insertions, 2 deletions

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 258cf16e7..9c8cc315e 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -8,3 +8,6 @@ ARCH="x86"
 ACCEPT_KEYWORDS="x86"
 
 USE="pam threads"
+
+INPUT_DEVICES="${INPUT_DEVICES} vmmouse"
+VIDEO_CARDS="${VIDEO_CARDS} amdgpu ast i128 i740 intel neomagic openchrome qxl rendition siliconmotion tga tseng vesa vmware"
diff --git a/profiles/arch/x86_64/make.defaults b/profiles/arch/x86_64/make.defaults
index 4a4fac9e6..b4a3edee5 100644
--- a/profiles/arch/x86_64/make.defaults
+++ b/profiles/arch/x86_64/make.defaults
@@ -30,3 +30,6 @@ CXXFLAGS="${CFLAGS}"
 ELIBC="musl"
 
 USE="amd64 amd64-linux pam threads"
+
+INPUT_DEVICES="${INPUT_DEVICES} vmmouse"
+VIDEO_CARDS="${VIDEO_CARDS} amdgpu ast i128 i740 intel neomagic openchrome qxl rendition siliconmotion tga tseng vesa vmware"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index a0f44949b..4d0860d5e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -59,6 +59,10 @@ PORTAGE_TMPDIR="/usr/src"
 
 APACHE2_MODULES="access_compat actions alias auth_basic auth_digest authn_alias authn_anon authn_core authn_file authz_core authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta cgi cgid charset_lite dav deflate dir dumpio env expires ext_filter file_cache filter headers ident imagemap include info lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation proxy proxy_balancer proxy_connect proxy_fcgi proxy_html proxy_http proxy_scgi ratelimit remoteip reqtimeout rewrite setenvif slotmem_shm socache_shmcb speling status substitute unique_id unixd userdir usertrack version vhost_alias"
 APACHE2_MPMS="event"
-INPUT_DEVICES="*"
-VIDEO_CARDS="amdgpu apm ast chips cirrus dummy epson fbdev glint i128 i740 intel mach64 mga neomagic nouveau nv qxl r128 radeon radeonsi rendition s3 s3virge savage siliconmotion sisusb tdfx tga trident tseng vesa via vmware voodoo"
+
+# vmmouse is x86 only
+INPUT_DEVICES="* -vmmouse"
+
+# only put video cards in the base profile that are supported on all architectures (at least tier 1)
+VIDEO_CARDS="apm chips cirrus dummy epson fbdev glint mach64 mga nouveau nv r128 radeon radeonsi s3 s3virge savage sisusb tdfx trident via voodoo"
 
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 9984a854b..80c76b9a4 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -134,6 +134,7 @@ app-emulation/wine cups fontconfig jpeg ncurses openal opengl perl pipelight png
 app-shells/rc readline
 app-text/evince djvu nsplugin -postscript tiff xps
 dev-python/pillow jpeg jpeg2k tiff truetype zlib
+games-emulation/dosbox alsa opengl
 games-engines/scummvm alsa flac fluidsynth jpeg mp3 opengl png theora truetype vorbis zlib
 games-simulation/openttd aplaymidi iconv -timidity zlib
 gnome-base/nautilus exif -previewer
@@ -146,6 +147,7 @@ media-libs/gst-plugins-base X theora
 media-libs/libpng apng
 media-libs/libsdl X alsa opengl pulseaudio
 media-libs/openal pulseaudio  # WINE.
+media-libs/sdl-sound flac modplug mp3 mpeg vorbis
 media-libs/tiff jpeg
 media-sound/fluidsynth alsa pulseaudio readline sndfile
 media-sound/timidity++ alsa