diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-06-23 17:50:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-06-23 17:50:06 +0000 |
| commit | cf0d45a61b3207652fdf39c0b9fbfec973d09d5e (patch) | |
| tree | 8d8387adf924daf6f6a8b6cd640a8c6440d2c616 /profiles | |
| parent | Initial multilib support wrt #474356 by Pacho Ramos (diff) | |
| download | gentoo-2-cf0d45a61b3207652fdf39c0b9fbfec973d09d5e.tar.gz gentoo-2-cf0d45a61b3207652fdf39c0b9fbfec973d09d5e.tar.bz2 gentoo-2-cf0d45a61b3207652fdf39c0b9fbfec973d09d5e.zip | |
Mask libpng with multilib support next to sys-libs/zlib wrt #474356, #457134
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 968b85dd310a..df802b24d3a8 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7967 2013/06/23 12:34:43 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7968 2013/06/23 17:50:06 ssuominen 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! + 23 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> package.mask: + Mask libpng with multilib support next to sys-libs/zlib wrt #474356, #457134 + 23 Jun 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask: mask for removal ~2013/07/23, depends on wrt bug 474480 155253 414177 diff --git a/profiles/package.mask b/profiles/package.mask index 5195c5969b46..7f7e7322d036 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,6 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14850 2013/06/23 12:34:43 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14851 2013/06/23 17:50:06 ssuominen 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 @@ -43,6 +43,7 @@ media-plugins/vdr-channelscan # that are incorporating native multilib support. >=app-arch/bzip2-1.0.6-r4 >=sys-libs/zlib-1.2.8-r1 +>=media-libs/libpng-1.6.2-r1 # Justin Bronder <jsbronder@gentoo.org> (21 Jun 2013) # Only ever used to build older version of media-gfx/openmesh |