summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-07-16 13:45:51 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-07-16 13:45:51 +0000
commit10604b358c0a1d40d3bd287a0da29ca739208435 (patch)
tree46d76461a5f0e03c2fc9ae659d830cd41e2de637 /profiles
parentRespect LINGUAS, remove old. (diff)
downloadgentoo-2-10604b358c0a1d40d3bd287a0da29ca739208435.tar.gz
gentoo-2-10604b358c0a1d40d3bd287a0da29ca739208435.tar.bz2
gentoo-2-10604b358c0a1d40d3bd287a0da29ca739208435.zip
Update glamor mask to only apply to stable xf86-video-intel.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/package.use.mask10
2 files changed, 10 insertions, 6 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 4b0323448f86..2784dd54af65 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.412 2012/07/12 19:16:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.413 2012/07/16 13:45:51 chithanh Exp $
+
+ 16 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ package.use.mask:
+ Update glamor mask to only apply to stable xf86-video-intel.
12 Jul 2012; <swift@gentoo.org> package.mask:
Adding selinux-phpfpm to the general selinux mask (upcoming new policy build)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b1742a1bd40c..4a3e50aada67 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,14 @@
# Copyright 1999-2012 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.370 2012/07/16 11:26:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.371 2012/07/16 13:45:51 chithanh Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2012)
+# Needs x11-libs/glamor stable first
+<x11-drivers/xf86-video-intel-2.20 glamor
+
# Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
# Stop glibc/uclibc from using iconv in blender
media-gfx/blender iconv
@@ -54,10 +58,6 @@ media-libs/opencv ipp
# Causes crashes and build failures, not needed by any package, bug #412177
<x11-libs/cairo-1.12 qt4
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (01 May 2012)
-# Experimental. Needs x11-libs/glamor keyworded first, bug #414295
-=x11-drivers/xf86-video-intel-2* glamor
-
# Johannes Huber <johu@gentoo.org> (19 Apr 2012)
# Required dep >=net-libs/telepathy-farstream is masked by gnome herd. Feel
# free to remove this entry, if mask is lifted.