diff options
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 d9d588077eb7..979b0b8374fa 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.9072 2014/06/12 19:01:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9073 2014/06/12 21:47:11 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! 12 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask: + Update slotted lua p.mask for multilib versions. + + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask: Unmask cppunit since it does not collide with emul-linux-x86 and is required for dev-python/subunit which is needed to fix dev-libs/check (bug #510892). diff --git a/profiles/package.mask b/profiles/package.mask index 7652434f6ef1..23a7927236c6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15785 2014/06/12 19:01:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15786 2014/06/12 21:47:11 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 @@ -395,7 +395,9 @@ dev-python/manifestdestiny # Masked slotted lua for testing app-admin/eselect-lua =dev-lang/lua-5.1.5-r2 +=dev-lang/lua-5.1.5-r100 =dev-lang/lua-5.2.3 +=dev-lang/lua-5.2.3-r1 # Samuli Suominen <ssuominen@gentoo.org> (12 Apr 2014) # Dead upstream, unused in gentoo-x86. |