summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0c4ed8b4e260..f665751aa39d 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.8531 2014/01/13 10:19:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8532 2014/01/14 17:00:48 jlec 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!
+ 14 Jan 2014; Justin Lecher <jlec@gentoo.org> package.mask:
+ Drop mask as patches apply now
+
13 Jan 2014; Tony Vroon <chainsaw@gentoo.org> package.mask:
Mask off Asterisk 12 as the first ebuild goes in.
diff --git a/profiles/package.mask b/profiles/package.mask
index cad57e88f198..8a78c1eef805 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15332 2014/01/13 10:21:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15333 2014/01/14 17:00:48 jlec 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
@@ -46,11 +46,6 @@
# See #484714
=sys-devel/gcc-4.8.2-r1
-# Justin Lecher <jlec@gentoo.org> (10 Jan 2014)
-# aufs3 patches do not apply cleanly onto 3.12.7
-sys-kernel/aufs-sources:3.12.7
-sys-kernel/aufs-sources:3.10.26
-
# Tom Wijsman <TomWij@gentoo.org> (09 Jan 2014)
# Monolithic dev-dotnet/{gnome,gtk}-sharp introduction mask, see bug #382491.
>=dev-dotnet/gnome-sharp-2.24.2-r1