diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-09-20 11:42:57 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-09-20 11:42:57 +0000 |
commit | d4ae950184a19af710ddc4e2bccff452cb90b76b (patch) | |
tree | 5786c31ed86a0b61da70c24aa1fd97929dda06c4 /profiles/base | |
parent | stable ppc ppc64, bug #434886 (diff) | |
download | gentoo-2-d4ae950184a19af710ddc4e2bccff452cb90b76b.tar.gz gentoo-2-d4ae950184a19af710ddc4e2bccff452cb90b76b.tar.bz2 gentoo-2-d4ae950184a19af710ddc4e2bccff452cb90b76b.zip |
Move media-libs/glu multilib mask to multilib profile, bug #435622.
Diffstat (limited to 'profiles/base')
-rw-r--r-- | profiles/base/package.use.force | 7 | ||||
-rw-r--r-- | profiles/base/package.use.mask | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index e688b34d71f9..7cbb5981ad35 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,11 +1,6 @@ # 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.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 +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.25 2012/09/20 11:42:57 chithanh Exp $ # Davide Pesavento <pesa@gentoo.org> (12 Sep 2012) # qt-creator-2.6.x uses botan-1.10.2, which isn't packaged yet, diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 582fd592b3f6..093abb7ebbf0 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,15 +1,10 @@ # 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.391 2012/09/19 23:35:09 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.392 2012/09/20 11:42:57 chithanh 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 |