Mask mplayer2 arch specific flags

5 files changed, 33 insertions, 13 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 101e5bad4528..5c3d415c52aa 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5223 2011/03/28 22:06:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5224 2011/03/28 22:10:03 lu_zero 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!
 
+  28 Mar 2011; Luca Barbato <lu_zero@gentoo.org>
+  arch/amd64/package.use.mask, arch/x86/package.use.mask,
+  base/package.use.mask:
+  Mask mplayer2 arch specific flags
+
   28 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> base/use.mask,
   default/linux/use.mask, prefix/linux/use.mask:
   Mask nouveau VIDEO_CARDS flag on non-Linux systems.
@@ -1593,7 +1598,7 @@
   +hardened/linux/powerpc/ppc64/server/parent, hardened/ppc/deprecated,
   hardened/ppc64/deprecated, profiles.desc:
   Update profiles, bug #344861
-  hardened/linux/powerpc/ppc32 
+  hardened/linux/powerpc/ppc32
   hardened/linux/powerpc/ppc64/32bit-userland
   hardened/linux/powerpc/ppc64/64bit-userland
 
@@ -1991,7 +1996,7 @@
   20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> package.mask:
   Add x11-terms/gnome-terminal to gnome 2.32 mask.
 
-  19 Oct 2010; Ole Markus With <olemarkus@gentoo.org> 
+  19 Oct 2010; Ole Markus With <olemarkus@gentoo.org>
   default/bsd/fbsd/make.defaults, default/linux/make.defaults:
   PHP ebuilds now make use of default USE flags. No longer any point in enabling
   them by default in make.defaults.
@@ -2091,7 +2096,7 @@
   09 Oct 2010; Pacho Ramos <pacho@gentoo.org> package.mask:
   Mask app-text/gnome-spell for removal.
 
-  08 Oct 2010; Ole Markus With <olemarkus@gentoo.org> 
+  08 Oct 2010; Ole Markus With <olemarkus@gentoo.org>
 	base/make.defaults,desc/php_targets.desc:
   Added PHP_TARGETS to USE_EXPAND
 
@@ -2160,7 +2165,7 @@
   Mask dev-python/IcePy.
 
   02 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
-  Masking sci-chemistry/validation for removal in 30 days. Does not 
+  Masking sci-chemistry/validation for removal in 30 days. Does not
   build, upstream is dead.
 
   02 Oct 2010; Fabian Groffen <grobian@gentoo.org> package.mask:
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 65de6c81147c..11ef75804ccf 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.119 2011/03/20 06:26:57 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.120 2011/03/28 22:10:03 lu_zero Exp $
+
+  28 Mar 2011; Luca Barbato <lu_zero@gentoo.org> package.use.mask:
+  Unmask bluray and vdpau for mplayer2
 
   20 Mar 2011; Mart Raudsepp <leio@gentoo.org> package.use.mask:
   Unmask orc USE flag on gst-plugins-good
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 662e4633b10a..c9abbc56073f 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.85 2011/03/20 06:41:48 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.86 2011/03/28 22:10:03 lu_zero 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
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Luca Barbato <lu_zero@gentoo.org> (28 Feb 2011)
+# Masked in base, unmask for amd64/x86
+media-video/mplayer2 -bluray -vdpau
+
 # Kacper Kowalik <xarthisius@gentoo.org> (22 Feb 2011)
 # >=heartbeat-3.0 is pmasked
 sys-cluster/pacemaker-gui heartbeat
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 93b2c2e9a671..0d10f325bc27 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # 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.50 2011/03/24 13:11:41 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.51 2011/03/28 22:10:04 lu_zero Exp $
 
 # This file requires >=portage-2.1.1
 
+# Luca Barbato <lu_zero@gentoo.org> (28 Feb 2011)
+# # Masked in base, unmask for amd64/x86
+media-video/mplayer2 -bluray -vdpau
+
 # Thomas Kahle <tomka@gentoo.org> package.use.mask (26 Feb 2011)
 # libprelude can't go stable at this point, snort can.
 =net-analyzer/snort-2.9.0.4 prelude
@@ -60,7 +64,7 @@ sys-power/pm-utils -video_cards_intel -video_cards_radeon
 # Vlastimil Babka <caster@gentoo.org> (31 Mar 2010)
 >=dev-java/sun-jdk-1.6 -nsplugin
 >=dev-java/sun-jre-bin-1.6 -nsplugin
->=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin
 >=dev-java/ibm-jre-bin-1.5 -nsplugin
 
 # Jim Ramsay <lack@gentoo.org> (24 March 2011)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 61a2c634cdfd..0d63c22f248b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,15 @@
 # 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.215 2011/03/27 17:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.216 2011/03/28 22:10:04 lu_zero Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
 
+# Luca Barbato <lu_zero@gentoo.org> (28 Mar 2011)
+# Mask mplayer2 arch specific flags
+media-video/mplayer2 vdpau bluray
+
 # Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011)
 #
 # Mask pdnsd's Linux-specific USE flags.
@@ -31,7 +35,7 @@ app-text/stardict pronounce
 
 # Raúl Porcel <armin76@gentoo.org> (13 Feb 2011)
 # Masked until devs know how to use repoman
-<media-video/mplayer-9999 bluray 
+<media-video/mplayer-9999 bluray
 
 # Samuli Suominen <ssuominen@gentoo.org> (05 Feb 2011)
 # Mask until x11-libs/gtk+:3 is in tree.
@@ -214,7 +218,7 @@ app-text/enchant zemberek
 # Php module fails to build due to newer autotools.
 >=media-libs/ming-0.4.0_beta5 php
 
-# Christian Faulhammer <opfer@gentoo.org> (03 Mar 2008) 
+# Christian Faulhammer <opfer@gentoo.org> (03 Mar 2008)
 # This feature is experimental and should be used by people willing to
 # test it
 app-portage/gatt libpaludis
@@ -225,7 +229,7 @@ dev-lang/php java-external
 
 dev-java/sun-jdk nsplugin
 dev-java/sun-jre-bin nsplugin
-dev-java/ibm-jdk-bin nsplugin 
+dev-java/ibm-jdk-bin nsplugin
 dev-java/ibm-jre-bin nsplugin
 
 # These are for BSD only