diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-04-18 15:20:31 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-04-18 15:20:31 +0000 |
| commit | 26431a33143257a797b35b68a730d0f33f1a1801 (patch) | |
| tree | 952b9cf60de0fa456addae76915107146a4bf2fa /profiles | |
| parent | Version bumps (diff) | |
| download | historical-26431a33143257a797b35b68a730d0f33f1a1801.tar.gz historical-26431a33143257a797b35b68a730d0f33f1a1801.tar.bz2 historical-26431a33143257a797b35b68a730d0f33f1a1801.zip | |
prepare media-libs/imlib2 for multilib conversion wrt #496376
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 990b30681bad..2b71c80addfc 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8833 2014/04/18 14:49:19 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8834 2014/04/18 15:20:31 hasufell 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! 18 Apr 2014; Julian Ospald <hasufell@gentoo.org> package.mask: + prepare media-libs/imlib2 for multilib conversion wrt #496376 + + 18 Apr 2014; Julian Ospald <hasufell@gentoo.org> package.mask: mask >=media-libs/imlib-1.9.15-r4 for multilib conversion wrt #499268 18 Apr 2014; Julian Ospald <hasufell@gentoo.org> package.mask: diff --git a/profiles/package.mask b/profiles/package.mask index 077b39c567ae..f661109c264d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15574 2014/04/18 14:49:19 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15575 2014/04/18 15:20:31 hasufell 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 @@ -432,6 +432,8 @@ dev-libs/libgcrypt:11 >=media-libs/giflib-4.2.3-r1 >=media-libs/aalib-1.4_rc5-r6 >=media-libs/imlib-1.9.15-r4 +=media-libs/imlib2-1.4.6-r2 +=media-libs/imlib2-9999-r1 # Tom Wijsman <TomWij@gentoo.org> (21 Feb 2014) # MATE Desktop Environment >=1.7 introduction mask: |