summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-07-24 17:55:24 +0000
committerChristian Ruppert <idl0r@gentoo.org>2012-07-24 17:55:24 +0000
commitc15a2f12dd9862181c89fe6591cb98237269ae2d (patch)
tree01bb207b61479c66a201ff8a69f0e9b55c6318b5 /profiles
parentmarked x86 per bug 420711 (diff)
downloadgentoo-2-c15a2f12dd9862181c89fe6591cb98237269ae2d.tar.gz
gentoo-2-c15a2f12dd9862181c89fe6591cb98237269ae2d.tar.bz2
gentoo-2-c15a2f12dd9862181c89fe6591cb98237269ae2d.zip
Mask media-video/nvidia-settings-3 because of the nvidia-drivers-3* mask
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 33a3e75d6d9e..e943bf6c7841 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6834 2012/07/24 13:43:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6835 2012/07/24 17:55:24 idl0r 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!
+ 24 Jul 2012; Christian Ruppert <idl0r@gentoo.org> package.mask:
+ Mask media-video/nvidia-settings-3 because of the nvidia-drivers-3* mask
+
24 Jul 2012; Anthony G. Basile <blueness@gentoo.org> package.mask:
Remove masks on sys-apps/elfix and dev-python/pypax, ready for testing
diff --git a/profiles/package.mask b/profiles/package.mask
index d6d47ca862ec..30b75ba1c4cd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14003 2012/07/24 13:43:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14004 2012/07/24 17:55:24 idl0r 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
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Christian Ruppert <idl0r@gentoo.org> (24 Jul 2012)
+# Masked because of the nvidia-drivers-3* mask below
+=media-video/nvidia-settings-3*
+
# Lars Wendler <polynomial-c@gentoo.org> (24 Jul 2012)
# Broken VNC patch (bug #427870). Masked for now.
=app-emulation/virtualbox-4.1.18-r1