summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-06-25 23:07:58 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-06-25 23:07:58 +0000
commita32b1aa14695892e3bd53e3e9f138f2cd633bf0c (patch)
tree9ebda2da0162190000c228407bc2eac0a07d3b0a /profiles
parentuse ABI vs DEFAULT_ABI to determine the default ABI as suggested by mgorny in... (diff)
downloadgentoo-2-a32b1aa14695892e3bd53e3e9f138f2cd633bf0c.tar.gz
gentoo-2-a32b1aa14695892e3bd53e3e9f138f2cd633bf0c.tar.bz2
gentoo-2-a32b1aa14695892e3bd53e3e9f138f2cd633bf0c.zip
unmask multilib lame
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 5 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 13d3c1494abe..3eff4da0bd9c 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.7973 2013/06/25 19:44:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7974 2013/06/25 23:07:58 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!
+ 25 Jun 2013; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask multilib lame
+
25 Jun 2013; Michael Weber <xmw@gentoo.org> package.mask:
broken hotot was removed
diff --git a/profiles/package.mask b/profiles/package.mask
index 092ca7ad76ed..6aaea4607a6f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14855 2013/06/25 19:44:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14856 2013/06/25 23:07:58 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
@@ -524,7 +524,6 @@ app-text/cuneiform
>=media-sound/wavpack-4.60.1-r1
>=media-sound/gsm-1.0.13-r1
>=media-libs/xvid-1.3.2-r1
->=media-sound/lame-3.99.5-r1
# Markos Chandras <hwoarang@gentoo.org> (13 Mar 2013)
# Mask because breaking updates out of the blue is bad