summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-12-05 15:27:22 +0000
committerMichał Górny <mgorny@gentoo.org>2014-12-05 15:27:22 +0000
commitf496da17299cdd9cb2ea07993dee2da3eb6bd75f (patch)
tree3f71c0299bf225f2e3568f8da22079d4d271f1f5 /profiles
parentUSE default-enabled USE=alsa-plugin to control installing the plugin, as agre... (diff)
downloadgentoo-2-f496da17299cdd9cb2ea07993dee2da3eb6bd75f.tar.gz
gentoo-2-f496da17299cdd9cb2ea07993dee2da3eb6bd75f.tar.bz2
gentoo-2-f496da17299cdd9cb2ea07993dee2da3eb6bd75f.zip
Unmask PulseAudio after reaching a compromise.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 136281f91fb4..62d87b7d8b40 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.9590 2014/12/05 11:20:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9591 2014/12/05 15:27:22 mgorny 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!
+ 05 Dec 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Unmask PulseAudio after reaching a compromise.
+
05 Dec 2014; Pacho Ramos <pacho@gentoo.org>
arch/amd64/no-emul-linux-x86/package.use.stable.mask,
arch/amd64/package.use.stable.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index f947b5668857..fb209c66c7e2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16202 2014/12/05 10:39:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16203 2014/12/05 15:27:22 mgorny 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
@@ -30,12 +30,6 @@
#--- END OF EXAMPLES ---
-# Pacho Ramos <pacho@gentoo.org> (05 Dec 2014)
-# QA team didn't even talk to us and bypassed bug #519530
-# Hardmasking until this is discussed futher as we have agreed
-# in the team
-=media-sound/pulseaudio-5.0-r6
-
# Ian Stakenvicius <axs@gentoo.org> (03 Dec 2014)
# masked for testing
media-libs/openh264