summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-09-08 20:25:25 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-09-08 20:25:25 +0000
commit2c9d7b02d2f64ae6d57cc24ed7a48de754a69de2 (patch)
treef6e389ab66072ac97a62171dd038812a8e69940e /profiles
parentVersion bump. (diff)
downloadgentoo-2-2c9d7b02d2f64ae6d57cc24ed7a48de754a69de2.tar.gz
gentoo-2-2c9d7b02d2f64ae6d57cc24ed7a48de754a69de2.tar.bz2
gentoo-2-2c9d7b02d2f64ae6d57cc24ed7a48de754a69de2.zip
masked media-libs/openal-1.15.1-r1 until emul-linux-* can be adjusted to remove the colliding files
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask8
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 272146eeb7db..ba617ccd25f7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8221 2013/09/08 18:30:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8222 2013/09/08 20:25:25 axs 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!
+ 08 Sep 2013; Ian Stakenvicius <axs@gentoo.org> package.mask:
+ masked media-libs/openal-1.15.1-r1 until emul-linux-* can be adjusted to
+ remove the colliding files
+
08 Sep 2013; Mikle Kolyada <zlogene@gentoo.org> package.mask:
Mask perl-5.18 and friends, again
diff --git a/profiles/package.mask b/profiles/package.mask
index 5378ead791f3..9df438188d0c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15090 2013/09/08 18:30:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15091 2013/09/08 20:25:25 axs 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
@@ -31,6 +31,12 @@
#--- END OF EXAMPLES ---
+# Ian Stakenvicius <axs@gentoo.org> (08 Sep 2013)
+# Collides with emul-linux-x86-sdl, will unmask after
+# fixed.
+# bug #484060
+=media-libs/openal-1.15.1-r1
+
# Mikle Kolyada <zlogene@gentoo.org> (08 Sep 2013)
# Untested / unconfirmed major bump of perl #479064
# Needs proper testing before being unleashed