summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 80970c31df5e..3a6830c450d0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8121 2013/08/07 08:55:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8122 2013/08/07 13:23:37 aballier 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!
+ 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask multilib expat
+
07 Aug 2013; Ben de Groot <yngwin@gentoo.org> base/package.use.mask:
Mask razor useflag on newer lightdm, bug #479734
diff --git a/profiles/package.mask b/profiles/package.mask
index c07d7c7b96bf..05eb42765086 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14987 2013/08/06 19:21:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14988 2013/08/07 13:23:37 aballier 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
@@ -45,10 +45,6 @@ dev-vcs/bzr-svn
=app-emulation/qemu-1.5.2
=app-emulation/qemu-1.4.2-r1
-# Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2013)
-# Temporarily mask, needs bumped emul- and blockers
->=dev-libs/expat-2.1.0-r3
-
# Ian Delaney <idella4@gentoo.org> (01 Aug 2013)
# Mask while awaiting bump to dep Djblets-0.7.16
=dev-util/reviewboard-1.7.12