summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-06-15 15:00:31 +0000
committerJeroen Roovers <jer@gentoo.org>2012-06-15 15:00:31 +0000
commitfa65e7e1f828e6ad1c624358da9c78a697029b43 (patch)
treebc4b2f1ca639c72f469101c87a0eeb1d12cc3d20 /profiles
parentmedia-plugins/gst-plugins-ffmpeg: Add fix for gcc-4.7: #407741, move to EAPI=4 (diff)
downloadgentoo-2-fa65e7e1f828e6ad1c624358da9c78a697029b43.tar.gz
gentoo-2-fa65e7e1f828e6ad1c624358da9c78a697029b43.tar.bz2
gentoo-2-fa65e7e1f828e6ad1c624358da9c78a697029b43.zip
Remove libnl-3.2.10 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 e86df139990d..9e5d8bad1fcd 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6672 2012/06/15 13:19:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6673 2012/06/15 15:00:31 jer 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!
+ 15 Jun 2012; Jeroen Roovers <jer@gentoo.org> package.mask:
+ Remove libnl-3.2.10 mask.
+
15 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
-hardened/linux/amd64/10.0/deprecated,
-hardened/linux/amd64/10.0/desktop/deprecated,
diff --git a/profiles/package.mask b/profiles/package.mask
index addf5bc1717e..278c95df1d67 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13858 2012/06/15 04:35:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13859 2012/06/15 15:00:31 jer 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
@@ -81,10 +81,6 @@ dev-python/generatorrunner
>=dev-lang/ocaml-4.00.0_alpha
>=dev-ml/findlib-1.3.2
-# Jeroen Roovers <jer@gentoo.org> (10 Jun 2012)
-# Breaks net-misc/networkmanager (bug #420261)
-=dev-libs/libnl-3.2.10
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (09 Jun 2012)
# Doesn't work, bug #420269. Bad dependencies, bugs #420173, #420307.
=sys-auth/polkit-0.106