Only unmask nouveau for x86 and amd64; follow the x11-base/xorg-drivers masking this time, but cover _all_ packages.

9 files changed, 20 insertions, 30 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c754f45b60cb..253ef7e1b887 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5227 2011/03/28 23:15:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5228 2011/03/29 01:58:47 flameeyes Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  29 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  arch/amd64/package.use.mask, arch/amd64/use.mask, arch/hppa/use.mask,
+  arch/x86/package.use.mask, arch/x86/use.mask, base/package.use.mask,
+  default/linux/use.mask, prefix/linux/use.mask:
+  Only unmask nouveau for x86 and amd64; follow the x11-base/xorg-drivers
+  masking this time, but cover _all_ packages.
+
   28 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> updates/1Q-2011:
   Add package move media-sound/phonon-xine > media-libs/phonon-xine, bug
   325319
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index c9abbc56073f..4ae923f36631 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.86 2011/03/28 22:10:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.87 2011/03/29 01:58:47 flameeyes Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -68,10 +68,6 @@ net-libs/xulrunner -ipc
 www-client/firefox -ipc
 www-client/icecat -ipc
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Apr 2010)
-# xf86-video-nouveau is supported on amd64.
-x11-base/xorg-drivers -video_cards_nouveau
-
 # Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)$
 # x86 platforms works$
 sys-power/pm-utils -video_cards_intel -video_cards_radeon
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index d247f21e8766..bfa758aec40b 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.18 2010/06/13 10:08:49 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.19 2011/03/29 01:58:47 flameeyes Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
@@ -64,6 +64,7 @@
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_vmware
+-video_cards_nouveau
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86/amd64
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 3544753eeccb..7f598f38d14c 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -1,5 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.35 2011/03/25 17:51:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.36 2011/03/29 01:58:47 flameeyes Exp $
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
 # Jeroen Roovers <jer@gentoo.org> (25 Mar 2011)
@@ -55,7 +55,6 @@ kde
 # Jeroen Roovers <jer@gentoo.org> (5 Apr 2010)
 # More video_cards_ drivers that HPPA does not support
 video_cards_svga
-video_cards_nouveau
 
 # Jeroen Roovers <jer@gentoo.org> (28 Feb 2010)
 # app-accessibility/flite does not work (bug #307241)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 0d10f325bc27..7d05686eab2b 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.51 2011/03/28 22:10:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.52 2011/03/29 01:58:47 flameeyes Exp $
 
 # This file requires >=portage-2.1.1
 
@@ -53,10 +53,6 @@ net-libs/xulrunner -ipc
 www-client/firefox -ipc
 www-client/icecat -ipc
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Apr 2010)
-# xf86-video-nouveau is supported on x86.
-x11-base/xorg-drivers -video_cards_nouveau
-
 # Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)
 # x86 platforms works
 sys-power/pm-utils -video_cards_intel -video_cards_radeon
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index d5d292343ae3..d4a9c2e96631 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 2004-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.21 2010/09/07 17:04:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.22 2011/03/29 01:58:47 flameeyes Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -x86
@@ -73,6 +73,7 @@
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_xgi
+-video_cards_nouveau
 
 # Modular X: mask for architectures on which they aren't available
 video_cards_newport
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0d63c22f248b..8786ef06b222 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.216 2011/03/28 22:10:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.217 2011/03/29 01:58:48 flameeyes Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -113,10 +113,6 @@ www-client/icecat ipc
 # Masked because libsvm module is broken with this release on every arch.
 dev-lisp/clisp svm
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Apr 2010)
-# Masked because xf86-video-nouveau is not supported on most archs.
-x11-base/xorg-drivers video_cards_nouveau
-
 # Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)
 # Masked because tools pulled in are not supported on most archs.
 sys-power/pm-utils video_cards_intel video_cards_radeon
diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask
index a99e84522278..70d743e5bcd2 100644
--- a/profiles/default/linux/use.mask
+++ b/profiles/default/linux/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.2 2011/03/28 22:06:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.3 2011/03/29 01:58:48 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -12,6 +12,3 @@ emul-linux-x86
 
 # ppc and x86/amd64
 x264
-
-# linux-only drivers
--video_cards_nouveau
diff --git a/profiles/prefix/linux/use.mask b/profiles/prefix/linux/use.mask
index 3c42cfb9ac59..cb058976b970 100644
--- a/profiles/prefix/linux/use.mask
+++ b/profiles/prefix/linux/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.mask,v 1.3 2011/03/28 22:06:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.mask,v 1.4 2011/03/29 01:58:48 flameeyes Exp $
 
 # Re-add linux stuff that is masked in base/
 -elibc_glibc
@@ -9,6 +9,3 @@
 
 # Re-add acl, as it does work in prefixed Linux (if the host kernel supports it)
 -acl
-
-# linux-only drivers
--video_cards_nouveau