summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-01-29 18:21:40 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-01-29 18:21:40 +0000
commit3ecafb7dcee10bb91c661c9c135045127daf963d (patch)
treee72ef17bcfd67e067de9a7ca753ced1c1325b008 /profiles
parentVersion bump, added upstream check (diff)
downloadgentoo-2-3ecafb7dcee10bb91c661c9c135045127daf963d.tar.gz
gentoo-2-3ecafb7dcee10bb91c661c9c135045127daf963d.tar.bz2
gentoo-2-3ecafb7dcee10bb91c661c9c135045127daf963d.zip
adjust libav p.mask for recently added multilib-build ebuilds
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b63decbdab3e..574c1227d9fd 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.8577 2014/01/29 10:25:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8578 2014/01/29 18:21:40 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!
+ 29 Jan 2014; Ian Stakenvicius <axs@gentoo.org> package.mask:
+ adjust libav p.mask for recently added multilib-build ebuilds
+
29 Jan 2014; Jeroen Roovers <jer@gentoo.org> package.mask:
Drop net-misc/socat-2 mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index a0c546164a58..c5a13b4d4cc1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15372 2014/01/29 10:25:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15373 2014/01/29 18:21:40 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
@@ -405,7 +405,7 @@ dev-python/python-irclib
# Luca Barbato <lu_zero@gentoo.org> (18 Dec 2013)
# Alpha ebuild, unmask to test the tree.
-=media-video/libav-10_alpha1
+~media-video/libav-10_alpha1
# Michał Górny <mgorny@gentoo.org> (15 Dec 2013)
# Masked for testing due to almost complete redesign. It is now
@@ -450,6 +450,8 @@ games-emulation/m64py
# Luca Barbato <lu_zero@gentoo.org> (03 Nov 2013)
# Multilib ready ebuild, some deps missing.
=media-video/libav-0.8.9-r1
+=media-video/libav-9.10-r1
+=media-video/libav-10_alpha1-r1
# Lars Wendler <polynomial-c@gentoo.org> (28 Oct 2013)
# Masked alpha releases for testing.