Sync with tree profiles June 10, 2012

18 files changed, 364 insertions, 26 deletions

diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index 3119c565..13fa4fcb 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,184 @@
 # ChangeLog for Gentoo/ARM profile directory
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.101 2010/10/30 11:56:29 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.157 2012/06/02 09:51:36 chithanh Exp $
+
+  02 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.use.mask:
+  Mask udis86 flag for llvm, which is of limited use outside x86/amd64.
+
+  15 May 2012; Benda Xu <heroxbd@gentoo.org> use.mask:
+  unmask ocamlopt on arm, as per bug 340607. Thanks to Josh Parsons
+
+  12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
+  gobject-introspection[doctool], bug #411761.
+
+  08 Apr 2012; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Use.mask aacplus
+
+  10 Feb 2012; Matt Turner <mattst88@gentoo.org> use.mask:
+  Mask wayland USE flag.
+
+  10 Feb 2012; Matt Turner <mattst88@gentoo.org> use.mask:
+  Mask d3d USE flag.
+
+  10 Feb 2012; Matt Turner <mattst88@gentoo.org> use.mask:
+  Add new video_cards_* to use.mask. Also remove dead radeonhd mask.
+
+  05 Feb 2012; Markus Meier <maekke@gentoo.org> use.mask:
+  remove ruby19 mask, bug #332593
+
+  05 Feb 2012; Markus Meier <maekke@gentoo.org> package.use.mask:
+  update x11-misc/colord gusb use-mask to match only stable version
+
+  05 Feb 2012; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Use.mask bluray, libtar, zvbi, bug #397891
+
+  09 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Unmask USE="jit" for webkit-gtk (bug #396313).
+
+  29 Nov 2011; Davide Pesavento <pesa@gentoo.org> package.use.mask:
+  Unmask USE="jit" for qt-webkit.
+
+  27 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  package.use.masked colord[gusb], needs libgusb keyworded (bug #392057).
+
+  25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Mask USE flags on gnome-3.2 packages due to missing keywords on deps; bug
+  #390345
+
+  06 Nov 2011; Markus Meier <maekke@gentoo.org> use.mask:
+  remove colord use.mask, bug #387959
+
+  03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  p.use.masking gnome-extra/gnome-media[aac,mp3,speex,twolame] due to missing
+  keywords in gst-plugins-{faac,lame,speex,twolame}, bug #389433.
+
+  28 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> use.mask:
+  use.mask colord to allow gtk+-3.2 unmasking. use.mask instead of p.use.mask
+  because other packages with this flag are coming. Bug #387959.
+
+  22 Oct 2011; Matt Turner <mattst88@gentoo.org> use.mask:
+  un-use.mask arm's iwmmxt flag.
+
+  21 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Undo poorly thought out masking of USE="colord packagekit" on gtk+; need to
+  get it keyworded properly (bug #387959)
+
+  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Unmask USE="packagekit" for x11-libs/gtk+.
+
+  11 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+  Remove the kde-4.7 mask as it is not needed anymore; keywording describes a
+  consistent package set
+
+  11 Sep 2011; Markus Meier <maekke@gentoo.org> use.mask:
+  use.mask mssql, bug #381709
+
+  07 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> package.mask:
+  Update kde mask
+
+  05 Sep 2011; Markus Meier <maekke@gentoo.org> package.use.mask:
+  package.use.mask some unkeyworded deps for bug 379657 and bug 379651
+
+  04 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> package.use.mask:
+  Bug #381737: block dev-libs/libmemcached[tcmalloc] until
+  dev-utils/google-perftools is keyworded (and virtual/gsasl on hppa/arm).
+
+  14 Aug 2011; Markus Meier <maekke@gentoo.org> use.mask:
+  remove -neon from common use.mask since it's unmasked in armv7a subprofile
+
+  14 Aug 2011; Markus Meier <maekke@gentoo.org> +armv4/make.defaults,
+  +armv4/parent, +armv4t/make.defaults, +armv4t/parent, +armv5te/make.defaults,
+  +armv5te/parent, +armv6j/make.defaults, +armv6j/parent,
+  +armv7a/make.defaults, +armv7a/parent, +armv7a/use.mask:
+  add armv4, armv4t, armv5re, armv6j and armv7a subprofiles
+
+  06 Aug 2011; Raúl Porcel <armin76@gentoo.org> package.use.mask:
+  Use.mask alsa webm for xulrunner-2 and firefox-5
+
+  28 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+  Add kde-base/kdepim-l10n to kde-4.7 package mask
+
+  03 Jul 2011; Raúl Porcel <armin76@gentoo.org> package.use.mask:
+  P.use.mask =sys-apps/portage-2.1.10* python3
+
+  30 Jun 2011; Pacho Ramos <pacho@gentoo.org> package.use.mask:
+  Needed plugins are not keyworded on this arch
+
+  29 May 2011; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Use.mask prelude
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
+
+  23 Apr 2011; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Add video_cards_nouveau to use.mask
+
+  14 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+  Drop useless kde mask.
+
+  08 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.use.mask:
+  Masked qscintilla useflag for pykde4, bug 362305
+
+  02 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
+
+  02 Apr 2011; Pacho Ramos <pacho@gentoo.org> package.use.mask:
+  Mask media-video/totem youtube USE flag as quvi support is needed to play
+  youtube files now.
+
+  31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.use.mask:
+  Drop mask on non-existant portage version.
+
+  20 Mar 2011; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Use.mask dvb
+
+  13 Mar 2011; Markus Meier <maekke@gentoo.org> package.use.mask:
+  remove net-firewall/iptables[netlink] mask wrt bug #354309
+
+  13 Mar 2011; Markus Meier <maekke@gentoo.org> package.use.mask:
+  package.use.mask sys-auth/polkit[kde], needs stable kde
+
+  04 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> +package.mask:
+  mask kde use for bug #357403
+
+  04 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> package.use.mask:
+  mask kde use for bug #357403
+
+  20 Feb 2011; Markus Meier <maekke@gentoo.org> use.mask:
+  use.mask pdfannotextractor (needs java)
+
+  30 Jan 2011; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Use.mask quvi
+
+  27 Jan 2011; Pacho Ramos <pacho@gentoo.org> package.use.mask:
+  Mask more gst-plugins-meta USE flags.
+
+  14 Jan 2011; Justin Lecher <jlec@gentoo.org> package.use.mask:
+  Mask app-misc/nut with USE=X as x11-libs/fltk is not keyworded
+
+  02 Jan 2011; Markus Meier <maekke@gentoo.org> use.mask:
+  use.mask upnp
+
+  08 Dec 2010; Raúl Porcel <armin76@gentoo.org> make.defaults:
+  Add omapfb
+
+  08 Dec 2010; Raúl Porcel <armin76@gentoo.org> use.mask:
+  Unmask omapfb
+
+  27 Nov 2010; Raúl Porcel <armin76@gentoo.org> package.use.mask:
+  Add portage python3 use-flag to p.use.mask
+
+  21 Nov 2010; Ryan Hill <dirtyepic@gentoo.org> use.mask:
+  Mask lpsol USE flag, needs sci-mathematics/glpk.
+
+  10 Nov 2010; Markus Meier <maekke@gentoo.org> package.use.mask:
+  remove buildbot{,-slave}[test] mask, as dev-python/mock is keyworded
+
+  08 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  package.use.mask:
+  Mask "test" USE flag of dev-util/buildbot*.
 
   30 Oct 2010; Markus Meier <maekke@gentoo.org> use.mask:
   use.mask libvirt
diff --git a/profiles/arch/arm/armv4/make.defaults b/profiles/arch/arm/armv4/make.defaults
new file mode 100644
index 00000000..ddeec5b9
--- /dev/null
+++ b/profiles/arch/arm/armv4/make.defaults
@@ -0,0 +1,3 @@
+CHOST="armv4l-unknown-linux-gnu"
+CFLAGS="-O2 -pipe -march=armv4"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv4/parent b/profiles/arch/arm/armv4/parent
new file mode 100644
index 00000000..f3229c5b
--- /dev/null
+++ b/profiles/arch/arm/armv4/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/armv4t/make.defaults b/profiles/arch/arm/armv4t/make.defaults
new file mode 100644
index 00000000..aef9bbf5
--- /dev/null
+++ b/profiles/arch/arm/armv4t/make.defaults
@@ -0,0 +1,3 @@
+CHOST="armv4tl-softfloat-linux-gnueabi"
+CFLAGS="-O2 -pipe -march=armv4t"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv4t/parent b/profiles/arch/arm/armv4t/parent
new file mode 100644
index 00000000..f3229c5b
--- /dev/null
+++ b/profiles/arch/arm/armv4t/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/armv5te/make.defaults b/profiles/arch/arm/armv5te/make.defaults
new file mode 100644
index 00000000..7f659b38
--- /dev/null
+++ b/profiles/arch/arm/armv5te/make.defaults
@@ -0,0 +1,3 @@
+CHOST="armv5tel-softfloat-linux-gnueabi"
+CFLAGS="-O2 -pipe -march=armv5te"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv5te/parent b/profiles/arch/arm/armv5te/parent
new file mode 100644
index 00000000..f3229c5b
--- /dev/null
+++ b/profiles/arch/arm/armv5te/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/armv6j/make.defaults b/profiles/arch/arm/armv6j/make.defaults
new file mode 100644
index 00000000..52da92ca
--- /dev/null
+++ b/profiles/arch/arm/armv6j/make.defaults
@@ -0,0 +1,3 @@
+CHOST="armv6j-unknown-linux-gnueabi"
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=softfp"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv6j/parent b/profiles/arch/arm/armv6j/parent
new file mode 100644
index 00000000..f3229c5b
--- /dev/null
+++ b/profiles/arch/arm/armv6j/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/armv7a/make.defaults b/profiles/arch/arm/armv7a/make.defaults
new file mode 100644
index 00000000..00d65967
--- /dev/null
+++ b/profiles/arch/arm/armv7a/make.defaults
@@ -0,0 +1,3 @@
+CHOST="armv7a-unknown-linux-gnueabi"
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv7a/parent b/profiles/arch/arm/armv7a/parent
new file mode 100644
index 00000000..f3229c5b
--- /dev/null
+++ b/profiles/arch/arm/armv7a/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
new file mode 100644
index 00000000..1752d302
--- /dev/null
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -0,0 +1,2 @@
+# Unmask armv7 specific USE flags
+-neon
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 29a1b5a6..ccb4c0f5 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -9,5 +9,4 @@ CXXFLAGS="${CFLAGS}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage sis tdfx trident \
-	voodoo"
+VIDEO_CARDS="fbdev omapfb"
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
new file mode 100644
index 00000000..7f3c125f
--- /dev/null
+++ b/profiles/arch/arm/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.25 2011/09/11 21:02:32 dilfridge Exp $
+
+# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
+# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
+# future versions of sys-apps/portage.
+<sys-devel/binutils-2.13.90.0.4
+<sys-devel/gcc-3.2
+<sys-libs/glibc-2.2.5
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index e396635d..910e2c4a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,11 +1,113 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.34 2010/08/15 14:19:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.77 2012/06/02 09:51:36 chithanh Exp $
+
+# Chí-Thanh Christopher Nguyen <chithanh@gentoo.org> (02 Jun 2012)
+# Mask udis86 flag for llvm, which is of limited use outside x86/amd64.
+sys-devel/llvm udis86
+
+# Robert Piasek <dagger@gentoo.org> (26 Apr 2012)          
+# Packages with optional systemd support. Masked in base and unmasked on arches
+# where sys-apps/systemd is available.
+>sys-auth/polkit-0.104-r1 -systemd
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (13 Apr 2012)
+# Packages with optional systemd support. Masked in base and unmasked on arches
+# where sys-apps/systemd is available.
+gnome-extra/gnome-screensaver -systemd
+gnome-extra/gnome-system-monitor -systemd
+net-misc/networkmanager -systemd
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
+# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
+# gobject-introspection[doctool], bug #411761
+dev-libs/gobject-introspection -doctool
+
+# Michael Sterrett <mr_bones_@gentoo.org> (04 Mar 2012)
+# arm is missing keywords for >=dev-libs/json-glib-0.12
+app-admin/syslog-ng json
+
+# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
+# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
+# it's masked in base profile and unmasked here (bug #396313).
+net-libs/webkit-gtk -jit
+
+# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
+# JavaScriptCore JIT is supported only on amd64/arm/x86,
+# so it's masked in base profile and unmasked here
+>=x11-libs/qt-webkit-4.7 -jit
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Nov 2011)
+# Missing keywords on dev-libs/libgusb, bug #392057
+=x11-misc/colord-0.1.15 gusb
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (25 Nov 2011)
+# Mask USE flags on gnome-3.2 packages due to missing keywords on deps;
+# bug #390345
+app-text/evince xps
+>=gnome-base/gdm-3 accessibility fprint gnome-shell smartcard
+>=gnome-base/gnome-menus-3.2 test
+>=gnome-base/gnome-panel-3 eds
+>=gnome-base/nautilus-3 previewer sendto
+
+# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
+# mask conntrack USE flag for dnsmasq as dep is not keyworded
+net-dns/dnsmasq conntrack
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (03 Nov 2011)
+# Missing keywords in gst-plugins-{faac,lame,speex,twolame}, bug #389433
+gnome-extra/gnome-media aac mp3 speex twolame
+
+# Markus Meier <maekke@gentoo.org> (05 Sep 2011)
+# unkeyworded deps for bug 379657 and bug 379651
+gnome-base/gnome-control-center cheese socialweb
+app-admin/packagekit-base entropy
+
+# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
+# Remove this for your arch after you keyword dev-utils/google-perftools and virtual/gsasl (bug #381737
+dev-libs/libmemcached tcmalloc sasl
+
+# Until we get bug 372199 fixed or subprofiles, we have to mask this
+>=net-libs/xulrunner-2.0 alsa webm
+>=www-client/firefox-5.0 alsa webm
+
+# Pacho Ramos <pacho@gentoo.org> (19 Jul 2011)
+# Missing keywords on dependencies
+app-cdr/brasero vcd
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (08 Apr 2011)
+# x11-libs/qscintilla still needs arm keywords, so...
+kde-base/pykde4 qscintilla
+
+# Pacho Ramos <pacho@gentoo.org> (02 Apr 2011)
+# quvi support is needed to play youtube files now
+media-video/totem youtube
+
+# Markus Meier <maekke@gentoo.org> (13 Mar 2011)
+# needs stable kde stuff
+sys-auth/polkit kde
+
+# Alexey Shvetsov <alexxy@gentoo.org> (04 Mar 2011)
+# Mask unsatisfied kde-deps bug #357403
+=kde-base/kdelibs-4.6* policykit
+=kde-base/solid-4.6* bluetooth
+
+# Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
+# No media-sound/lilypond here, yet (bug #356069)
+app-text/asciidoc test
+
+# Michael Weber <xmw@gentoo.org> (10 Feb 2011)
+# kde-base/kdelibs is not stable for arm
+net-libs/libproxy kde
+
+# Justin Lecher <jlec@gentoo.org> (14 Jen 2011)
+# x11-libs/fltk is not keyworded for arm
+app-misc/nut X
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (29 Jul 2010)
 # Mask python3 for stable portage until python-3.x is marked stable.
-=sys-apps/portage-2.1.8* python3
-=sys-apps/portage-2.1.7* python3
+=sys-apps/portage-2.1.10* python3
+=sys-apps/portage-2.1.9* python3
 
 # Nirbheek Chauhan <nirbheek@gentoo.org> (26 Jun 2010)
 # Inter-process communication doesn't work on anything except x86/amd64/arm
@@ -51,7 +153,11 @@ dev-libs/boost mpi
 
 # missing keywords
 media-sound/sox ladspa
-media-plugins/gst-plugins-meta lame taglib
+media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 
 # projectm not keyworded, bug #314969
 media-video/vlc projectm
+
+# Ultrabug <ultrabug@gentoo.org) (05 Sept 2011)
+# missing keyword for net-libs/zeromq
+app-admin/rsyslog zeromq
diff --git a/profiles/arch/arm/packages b/profiles/arch/arm/packages
deleted file mode 100644
index 177ffcff..00000000
--- a/profiles/arch/arm/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/packages,v 1.1 2008/04/01 17:39:55 wolf31o2 Exp $
-
->=sys-devel/binutils-2.13.90.0.4
->=sys-devel/gcc-3.2
->=sys-libs/glibc-2.2.5
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 3edfc705..86d54f46 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -1,6 +1,9 @@
 # Unmask the flag which corresponds to ARCH.
 -arm
 
+# Unmask arm arch specific flags
+-iwmmxt
+
 # Markus Meier <maekke@gentoo.org> (22 Aug 2010)
 # net-wireless/wimax not tested
 wimax
@@ -28,7 +31,6 @@ networkmanager
 # Raúl Porcel <armin76@gentoo.org>
 # Fails to build/work
 openexr
-ocamlopt
 
 # Samuli Suominen <drac@gentoo.org>
 # media-libs/amrnb and media-libs/amrwb not tested.
@@ -50,7 +52,8 @@ java-internal
 java-external
 
 # No hardware to test by the team
-iphone
+dvb
+ios
 ipod
 
 # Stuff that doesn't make sense on this arch
@@ -79,6 +82,9 @@ frei0r
 google-gadgets
 oracle
 libvirt
+pdfannotextractor
+prelude
+mssql
 
 # havent tested yet
 cupsddk
@@ -105,7 +111,7 @@ lapack
 cblas
 prolog
 sid
-libmms
+mms
 mtp
 ieee1394
 sctp
@@ -126,6 +132,17 @@ rtmp
 vpx
 iplayer
 plotutils
+lpsol
+upnp
+quvi
+bluray
+libtar
+zvbi
+aacplus
+
+# Unmask ARM-only video-cards
+-video_cards_exynos
+-video_cards_omapfb
 
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
@@ -144,11 +161,11 @@ video_cards_mach64
 video_cards_mga
 video_cards_neomagic
 video_cards_newport
+video_cards_nouveau
 video_cards_nsc
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_radeonhd
 video_cards_rendition
 video_cards_s3
 video_cards_s3virge
@@ -163,6 +180,17 @@ video_cards_vesa
 video_cards_via
 video_cards_voodoo
 
+# Matt Turner <mattst88@gentoo.org>
+# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_r100
+video_cards_r200
+video_cards_r300
+video_cards_r600
+video_cards_i915
+video_cards_i965
+# vmware wasn't added with mesa-8.0, but it should still be masked
+video_cards_vmware
+
 # 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures lacking direct rendering      
 dri
@@ -184,3 +212,11 @@ dri
 # Bug #184563, 18 Sep 2007 
 # Robin H. Johnson <robbat2@gentoo.org>
 audit
+
+# Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
+# mask d3d since we don't have wine
+d3d
+
+# Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
+# mask wayland since dev-libs/wayland isn't keyworded
+wayland
diff --git a/profiles/arch/arm/virtuals b/profiles/arch/arm/virtuals
deleted file mode 100644
index 400fcc1c..00000000
--- a/profiles/arch/arm/virtuals
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/virtuals,v 1.2 2009/05/28 15:24:50 ssuominen Exp $
-
-virtual/bootloader		sys-boot/nettrom
-virtual/linux-sources		sys-kernel/vanilla-sources