From c685dacbef8b8ff18435b7d835f8b6a31ff4786b Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Thu, 30 Aug 2012 17:29:49 +0200
Subject: [PATCH] Revert "Revert "[intel/portage] unmask new libdrm,
 xf86-video-ati and xf86-video-nouveau for testing""

This reverts commit 2347b8efef1f031b8bdfc3f47b157134c878dd1b.

Conflicts:

	conf/intel/portage/package.unmask
---
 conf/intel/portage/package.unmask | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/intel/portage/package.unmask b/conf/intel/portage/package.unmask
index b06e9e3..c020c52 100644
--- a/conf/intel/portage/package.unmask
+++ b/conf/intel/portage/package.unmask
@@ -123,3 +123,11 @@ media-video/nvidia-settings::sabayon-distro
 =dev-db/mariadb-5.5*
 =dev-db/mysql-5.5*
 =virtual/mysql-5.5*
+
+# Unmask for us:
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (11 May 2012)
+# Nouveau API break, mask until situation becomes palatable for users
+# xf86-video-ati-6.14.5 needs new libdrm
+<x11-drivers/xf86-video-ati-9999
+<x11-drivers/xf86-video-nouveau-9999
+<x11-libs/libdrm-9999