diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2013-02-11 09:19:44 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2013-02-11 09:19:44 +0000 |
| commit | 867c1510ae7e82c8ce252099710c0602afe39a0f (patch) | |
| tree | 929095d69ba729bd009fb4f274bf2f4034ba70e0 /profiles | |
| parent | Remove old. (diff) | |
| download | historical-867c1510ae7e82c8ce252099710c0602afe39a0f.tar.gz historical-867c1510ae7e82c8ce252099710c0602afe39a0f.tar.bz2 historical-867c1510ae7e82c8ce252099710c0602afe39a0f.zip | |
Adjust cairo[qt4] usemask to cover all versions, since it still leads to build errors (bug #454066)
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index be150891c491..5f35987c620e 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7476 2013/02/11 07:33:42 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7477 2013/02/11 09:19:43 yngwin 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! + 11 Feb 2013; Ben de Groot <yngwin@gentoo.org> base/package.use.mask: + Adjust cairo[qt4] usemask to cover all versions, since it still leads to + build errors (bug #454066) + 11 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask: Add media-plugins/gst-plugins-ffmpeg-0.10.13_p201211 prereleases to libav package.mask (bug #423717). diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 53326106be76..8603a714cb6b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.435 2013/02/10 16:52:53 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.436 2013/02/11 09:19:44 yngwin Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -51,7 +51,7 @@ www-client/firefox pgo media-libs/opencolorio pdf # Chris Reffett <creffett@gentoo.org> (23 Nov 2012) -# CMake's PHP module can't find our install location, so +# CMake's PHP module can't find our install location, so # libkolab(xml) fails with the php flag enabled. net-libs/libkolab php net-libs/libkolabxml php @@ -167,7 +167,7 @@ media-libs/opencv ipp # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (02 May 2012) # Causes crashes and build failures, not needed by any package, bug #412177 -<x11-libs/cairo-1.12 qt4 +x11-libs/cairo qt4 # Alexandre Rostovtsev <tetromino@gentoo.org> (13 Apr 2012) # Packages with optional systemd support. Masked in base and unmasked on arches |