Move media-libs/glu multilib mask to multilib profile, bug #435622.

4 files changed, 16 insertions, 13 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 810c3b445e61..f259a62e149f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6977 2012/09/19 23:51:42 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6978 2012/09/20 11:42:56 chithanh 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!
 
+  20 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +features/multilib/package.use.mask, base/package.use.force,
+  base/package.use.mask:
+  Move media-libs/glu multilib mask to multilib profile, bug #435622.
+
   19 Sep 2012; Matt Turner <mattst88@gentoo.org> package.mask:
   Remove mask on glu and mesa now that the multilib USE flag has been forced
   off and masked.
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
diff --git a/profiles/features/multilib/package.use.mask b/profiles/features/multilib/package.use.mask
new file mode 100644
index 000000000000..c705bca0e58f
--- /dev/null
+++ b/profiles/features/multilib/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/package.use.mask,v 1.1 2012/09/20 11:42:57 chithanh 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