diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2012-09-19 23:44:56 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2012-09-19 23:44:56 +0000 |
| commit | 69a6d8287e52e945ddf7937b96e89228081d99a7 (patch) | |
| tree | 0b3c505c38b78e3c479d36c1cee67349202877b4 | |
| parent | Add media-libs/glu multilib to package.use.mask. (diff) | |
| download | gentoo-2-69a6d8287e52e945ddf7937b96e89228081d99a7.tar.gz gentoo-2-69a6d8287e52e945ddf7937b96e89228081d99a7.tar.bz2 gentoo-2-69a6d8287e52e945ddf7937b96e89228081d99a7.zip | |
Add media-libs/glu -multilib to package.use.force
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.force | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 7ed61e84ed8d..a3d993b5b6e6 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.437 2012/09/19 23:35:09 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.438 2012/09/19 23:44:56 mattst88 Exp $ + + 19 Sep 2012; Matt Turner <mattst88@gentoo.org> package.use.force: + Add media-libs/glu -multilib to package.use.force 19 Sep 2012; Matt Turner <mattst88@gentoo.org> package.use.mask: Add media-libs/glu multilib to package.use.mask. diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index f9486340cf61..e688b34d71f9 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,6 +1,11 @@ # 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.force,v 1.23 2012/09/12 01:08:49 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.24 2012/09/19 23:44:56 mattst88 Exp $ + +# 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 # Davide Pesavento <pesa@gentoo.org> (12 Sep 2012) # qt-creator-2.6.x uses botan-1.10.2, which isn't packaged yet, |