From: Michał Górny Date: Sun, 1 Feb 2015 22:58:57 +0000 (+0000) Subject: Mask media-tv/xbmc[libav] since USE=vdpau requires masked libav. Sad we can't mask... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=514bc8233368f2e8db1c93e2fd7a60df486f8e6d;p=gentoo.git Mask media-tv/xbmc[libav] since USE=vdpau requires masked libav. Sad we can't mask the combination of the two... --- diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 8fc204b0a692..4e90cb287d19 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9743 2015/02/01 22:44:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9744 2015/02/01 22:58:57 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! + 01 Feb 2015; Michał Górny base/package.use.mask: + Mask media-tv/xbmc[libav] since USE=vdpau requires masked libav. Sad we can't + mask the combination of the two... + 01 Feb 2015; Michał Górny base/package.use.mask, package.mask: Mask app-text/unpaper[libav] since it requires masked libav version. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index a0ea11bbb71e..259c09ed943b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.636 2015/02/01 22:44:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.637 2015/02/01 22:58:57 mgorny Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -8,6 +8,7 @@ # Michał Górny (01 Feb 2015) # The required libav version is masked. app-text/unpaper libav +media-tv/xbmc libav # Brian Evans (22 Jan 2015) # PHP module split into dev-php/ming-php which is still ~arch