diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2012-09-19 23:35:09 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2012-09-19 23:35:09 +0000 |
| commit | 86b838389c971b861090e6d96372c0a7ffa0537f (patch) | |
| tree | 9b2d6e4834e5f22000f303050ee6e83e8db82820 /profiles | |
| parent | Stable for HPPA (bug #379991). (diff) | |
| download | gentoo-2-86b838389c971b861090e6d96372c0a7ffa0537f.tar.gz gentoo-2-86b838389c971b861090e6d96372c0a7ffa0537f.tar.bz2 gentoo-2-86b838389c971b861090e6d96372c0a7ffa0537f.zip | |
Add media-libs/glu multilib to package.use.mask.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 5b7779e30325..7ed61e84ed8d 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.436 2012/09/14 21:57:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.437 2012/09/19 23:35:09 mattst88 Exp $ + + 19 Sep 2012; Matt Turner <mattst88@gentoo.org> package.use.mask: + Add media-libs/glu multilib to package.use.mask. 14 Sep 2012; Johannes Huber <johu@gentoo.org> package.use.mask: Masked media-libs/phonon[zeitgeist] for stabilization as the use flag pulls a diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 61ba05d72da9..582fd592b3f6 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,10 +1,15 @@ # Copyright 1999-2012 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.390 2012/09/14 21:57:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.391 2012/09/19 23:35:09 mattst88 Exp $ # This file requires >=portage-2.1.1 # New entries go on top. +# Matt Turner <mattst88@gentoo.org> (19 Sep 2012) +# multilib requires 32-bit libGL provided by emul-linux-x86-opengl +# but also collides with 32-bit libGLU installed by emul-linux-x86-opengl +media-libs/glu multilib + # Johannes Huber <johu@gentoo.org> (14 Sep 2012) # Masked for stabilization as the use flag pulls a dep tree of hell. media-libs/phonon zeitgeist |