summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-01-05 18:22:47 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-01-05 18:22:47 +0000
commit5f6cce9d7034d6cbd0731263bed8f5f4863954d0 (patch)
tree4d996b3b160ffd2ec333d4afb700ef8902025b7f /profiles
parentStable for alpha, wrt bug #488806 (diff)
downloadgentoo-2-5f6cce9d7034d6cbd0731263bed8f5f4863954d0.tar.gz
gentoo-2-5f6cce9d7034d6cbd0731263bed8f5f4863954d0.tar.bz2
gentoo-2-5f6cce9d7034d6cbd0731263bed8f5f4863954d0.zip
Adjusted polarssl use.mask for media-sound/umurmur
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask5
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index acf1bbe77562..fa7fd5be3ebb 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.626 2014/01/04 22:26:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.627 2014/01/05 18:22:47 polynomial-c Exp $
+
+ 05 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> package.use.mask:
+ Adjusted polarssl use.mask for media-sound/umurmur.
04 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> package.use.mask:
Mask dev-vcs/git[mediawiki] until dependencies are keyworded
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index fb81142c8f43..2a7d006f1257 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.538 2014/01/04 23:17:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.539 2014/01/05 18:22:47 polynomial-c Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -17,7 +17,8 @@ dev-libs/boost context
# Lars Wendler <polynomial-c@gentoo.org> (26 Dec 2013)
# Masked until upstream has fixed support with >=polarssl-1.3.0
# (see upstream bug https://github.com/fatbob313/umurmur/issues/24)
-media-sound/umurmur polarssl
+# and affected versions are removed from the tree.
+<media-sound/umurmur-0.2.14 polarssl
# Gilles Dartiguelongue <eva@gentoo.org> (25 Dec 2013)
# gjs: tests fail and support for it was purely and simply removed in master/1.9