From: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Date: Wed, 31 Mar 2010 20:05:35 +0000 (+0000)
Subject: remove openchrome mask, add pixman
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a937ddb7387ca3ec9daf56f7946c463cf1a5097b;p=gentoo.git

remove openchrome mask, add pixman
---

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 9c2e880cf19e..96c93b873f57 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4074 2010/03/31 17:26:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4075 2010/03/31 20:05:34 chithanh 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!
 
+  31 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.mask:
+  remove openchrome mask, add pixman
+
   31 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Mask xfce-extra/xfce4-volstatus-icon and xfce-extra/xfce4-indicator-plugin
   for removal.
diff --git a/profiles/package.mask b/profiles/package.mask
index 84de3c8a94df..b8d1137265e4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11404 2010/03/31 17:53:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11405 2010/03/31 20:05:35 chithanh 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
@@ -79,10 +79,6 @@ app-forensics/samhain
 # lucene and possibly others. see #309961
 =dev-java/javacc-5.0
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (21 Mar 2010)
-# Masked pending maintainer approval, bug #298352
-=x11-drivers/xf86-video-openchrome-0.2.904-r1
-
 # Petteri Räty <betelgeuse@gentoo.org> (20 Mar 2010)
 # Use the from source dev-java/openjms instead
 dev-java/openjms-bin
@@ -427,6 +423,7 @@ dev-db/mysql-community
 # Rémi Cardona <remi@gentoo.org> (27 Jan 2010)
 # dev package with fatal asserts(), see bug #301892
 =x11-libs/pixman-0.17.4
+=x11-libs/pixman-0.17.14
 
 # Patrick Lauer <patrick@gentoo.org> (26 Jan 2010)
 # Masking alpha for testing