summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2014-11-23 22:52:13 +0000
committerRémi Cardona <remi@gentoo.org>2014-11-23 22:52:13 +0000
commitaa065aead7932236d13cc760ad784d0f177375ee (patch)
tree49f401b07e80c938baafb8a31fec70391a896515 /profiles
parentVersion bump. Completely superseeds appdata-tools. (diff)
downloadgentoo-2-aa065aead7932236d13cc760ad784d0f177375ee.tar.gz
gentoo-2-aa065aead7932236d13cc760ad784d0f177375ee.tar.bz2
gentoo-2-aa065aead7932236d13cc760ad784d0f177375ee.zip
profiles: Remove xorg-server 1.16.2 from p.mask
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ee47daf7d87a..3ddc0b3ea0ef 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9558 2014/11/23 14:41:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9559 2014/11/23 22:52:13 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!
+ 23 Nov 2014; Rémi Cardona <remi@gentoo.org> package.mask:
+ Remove xorg-server 1.16.2 from p.mask, x11 team agrees on binary slot
+
23 Nov 2014; Pacho Ramos <pacho@gentoo.org>
arch/amd64/no-emul-linux-x86/package.use.stable.mask,
arch/amd64/package.use.stable.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 5c68e0d9f327..e3661c3b3369 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16175 2014/11/21 20:38:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16176 2014/11/23 22:52:13 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
@@ -43,10 +43,6 @@
# Mask latest development version for testing
=x11-misc/lightdm-1.13*
-# Rémi Cardona <remi@gentoo.org> (15 Nov 2014)
-# Masked until decision is made about binary slot
-=x11-base/xorg-server-1.16.2
-
# Eray Aslan <eras@gentoo.org> (11 Nov 2014)
# Mask beta releases
=net-proxy/squid-3.5*