From c5391cb53b236b6bc665d44fa536b64902f1cae3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 1 Feb 2015 22:44:07 +0000 Subject: [PATCH] Mask app-text/unpaper[libav] since it requires masked libav version. --- profiles/ChangeLog | 6 +++++- profiles/base/package.use.mask | 6 +++++- profiles/package.mask | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index bc9925548dca..8fc204b0a692 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.9742 2015/02/01 21:13:53 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9743 2015/02/01 22:44:06 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, + package.mask: + Mask app-text/unpaper[libav] since it requires masked libav version. + 01 Feb 2015; Tim Harder package.mask: Remove old inkscape pre-release mask. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index ae25be7631a5..a0ea11bbb71e 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,10 +1,14 @@ # 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.635 2015/02/01 11:04:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.636 2015/02/01 22:44:07 mgorny Exp $ # This file requires >=portage-2.1.1 # New entries go on top. +# Michał Górny (01 Feb 2015) +# The required libav version is masked. +app-text/unpaper libav + # Brian Evans (22 Jan 2015) # PHP module split into dev-php/ming-php which is still ~arch (30 Mar 2014) # Current stable for upstream, pending a tinderbox run. # Note: mask restored because of #509294, #519258. +# +# When unmasking, please also remove reverse dependency mask +# and package.use.mask entries in base/package.use.mask. =media-video/libav-10* =media-video/libav-11* -- 2.26.2