diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-02-01 22:44:07 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-02-01 22:44:07 +0000 |
| commit | f9b7d1da9556b9d437655fcb24075bda874058ef (patch) | |
| tree | 28e59bfd87f130684c4d8753a9f693714a64c51b /profiles | |
| parent | dev-haskell/dataenc: drop old (diff) | |
| download | gentoo-2-f9b7d1da9556b9d437655fcb24075bda874058ef.tar.gz gentoo-2-f9b7d1da9556b9d437655fcb24075bda874058ef.tar.bz2 gentoo-2-f9b7d1da9556b9d437655fcb24075bda874058ef.zip | |
Mask app-text/unpaper[libav] since it requires masked libav version.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 6 | ||||
| -rw-r--r-- | 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 <mgorny@gentoo.org> base/package.use.mask, + package.mask: + Mask app-text/unpaper[libav] since it requires masked libav version. + 01 Feb 2015; Tim Harder <radhermit@gentoo.org> 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 <mgorny@gentoo.org> (01 Feb 2015) +# The required libav version is masked. +app-text/unpaper libav + # Brian Evans <grknight@gentoo.org> (22 Jan 2015) # PHP module split into dev-php/ming-php which is still ~arch <media-libs/ming-0.4.5 php diff --git a/profiles/package.mask b/profiles/package.mask index d022ec93f4d2..4c0a30ad1ad0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16317 2015/02/01 21:13:54 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16318 2015/02/01 22:44:06 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 @@ -692,6 +692,9 @@ sys-fs/rdiff-backup-fs # Luca Barbato <lu_zero@gentoo.org> (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* |