summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5f32fb21ee29..d9a66e165045 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3336 2009/10/02 13:12:12 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3337 2009/10/02 21:22:24 remi 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!
02 Oct 2009; Rémi Cardona <remi@gentoo.org> package.mask:
+ unmask xorg-server 1.6.4
+
+ 02 Oct 2009; Rémi Cardona <remi@gentoo.org> package.mask:
update xorg-server package.mask entry, add 1.6.4.901
01 Oct 2009; Marcus D. Hanwell <cryos@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index fe833c545e9c..0281e2a7fa57 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10528 2009/10/02 16:30:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10529 2009/10/02 21:22:24 remi 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
@@ -71,12 +71,6 @@ media-plugins/flexplaylist
# wsgiref module is included in Python >=2.5. Masked for deletion in 30 days.
dev-python/wsgiref
-# Rémi Cardona <remi@gentoo.org> (28 Sep 2009)
-# 1.6.4 breaks nearly all X drivers, see bug #286746
-# 1.6.4.901 is masked for testing, will be unmasked if deemed safe
-=x11-base/xorg-server-1.6.4
-=x11-base/xorg-server-1.6.4.901
-
# Samuli Suominen <ssuominen@gentoo.org> (28 Sep 2009)
# Obsolete. Supported by in-kernel drivers. Masked for removal,
# see bug 159176.