Don't include ${USE} in the first assignment to USE in make.defaults files to avoid incorrect interactions between enabled and disabled flags in different files.

17 files changed, 67 insertions, 50 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6425000ada70..dd67adaa9ae8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,29 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5042 2011/02/13 11:32:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5043 2011/02/13 16:53:39 arfrever 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!
 
+  13 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  arch/amd64/make.defaults, base/make.defaults,
+  default/bsd/fbsd/amd64/7.2/make.defaults,
+  default/bsd/fbsd/amd64/8.0/make.defaults,
+  default/bsd/fbsd/x86/7.2/make.defaults,
+  default/bsd/fbsd/x86/8.0/make.defaults,
+  hardened/amd64/multilib/make.defaults,
+  prefix/darwin/macos/10.4/x86/make.defaults,
+  prefix/darwin/macos/10.5/x64/make.defaults,
+  prefix/darwin/macos/10.5/x86/make.defaults,
+  prefix/darwin/macos/10.6/x64/make.defaults,
+  prefix/darwin/macos/10.6/x86/make.defaults, prefix/linux/make.defaults,
+  releases/10.0/make.defaults, releases/2008.0/make.defaults,
+  releases/freebsd-7.2/make.defaults:
+  Don't include ${USE} in the first assignment to USE in make.defaults files to
+  avoid incorrect interactions between enabled and disabled flags in different
+  files.
+
   13 Feb 2011; Tim Harder <radhermit@gentoo.org> base/package.use.mask:
   Remove mask on the bluray USE flag for mplayer.
 
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 8f9ba5b5daac..70dd3831febe 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.6 2010/08/23 21:16:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.7 2011/02/13 16:53:39 arfrever Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -30,7 +30,7 @@ CDEFINE_x86="__i386__"
 # 2006/10/24 - Simon Stelling <blubb@gentoo.org>
 # They are masked, but we can enable them anyway for those who have 
 # >=portage-2.1.2_pre3-r4
-USE="${USE} mmx sse sse2"
+USE="mmx sse sse2"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 13fcccead740..823988fc7a67 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.60 2010/12/24 15:44:26 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.61 2011/02/13 16:53:39 arfrever Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -62,7 +62,7 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Diego Pettenò <flameeyes@gentoo.org> (14 Jul 2007)
 # Moved to base/ profile from default-linux/ so that it also applies to
 # embedded and hardened profiles.
-USE="${USE} cracklib"
+USE="cracklib"
 
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008)
 # Netbeans modules/clusters
diff --git a/profiles/default/bsd/fbsd/amd64/7.2/make.defaults b/profiles/default/bsd/fbsd/amd64/7.2/make.defaults
index 04e284d2fd6e..04bca5306de1 100644
--- a/profiles/default/bsd/fbsd/amd64/7.2/make.defaults
+++ b/profiles/default/bsd/fbsd/amd64/7.2/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/7.2/make.defaults,v 1.2 2010/06/11 14:10:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/7.2/make.defaults,v 1.3 2011/02/13 16:53:39 arfrever Exp $
 # System-wide defaults for the x86 G/FBSD 7.2 Portage system
 
 CHOST="x86_64-gentoo-freebsd7.2"
@@ -9,4 +9,4 @@ CHOST_x86_fbsd="i686-gentoo-freebsd7.2"
 
 # Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
 # Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="${USE} java6"
+USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/8.0/make.defaults b/profiles/default/bsd/fbsd/amd64/8.0/make.defaults
index ce8340cdd7e9..ebcaf5aaf202 100644
--- a/profiles/default/bsd/fbsd/amd64/8.0/make.defaults
+++ b/profiles/default/bsd/fbsd/amd64/8.0/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/8.0/make.defaults,v 1.2 2010/06/11 14:10:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/8.0/make.defaults,v 1.3 2011/02/13 16:53:39 arfrever Exp $
 
 CHOST="x86_64-gentoo-freebsd8.0"
 CHOST_amd64_fbsd="x86_64-gentoo-freebsd8.0"
@@ -8,4 +8,4 @@ CHOST_x86_fbsd="i686-gentoo-freebsd8.0"
 
 # Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
 # Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="${USE} java6"
+USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/7.2/make.defaults b/profiles/default/bsd/fbsd/x86/7.2/make.defaults
index 349e2ae59b49..b273036600e9 100644
--- a/profiles/default/bsd/fbsd/x86/7.2/make.defaults
+++ b/profiles/default/bsd/fbsd/x86/7.2/make.defaults
@@ -1,10 +1,10 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/7.2/make.defaults,v 1.1 2009/05/17 10:58:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/7.2/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 # System-wide defaults for the x86 G/FBSD 7.2 Portage system
 
 CHOST="i486-gentoo-freebsd7.2"
 
 # Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
 # Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="${USE} java6"
+USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/8.0/make.defaults b/profiles/default/bsd/fbsd/x86/8.0/make.defaults
index d0fc2aff90ee..6747d389d0c6 100644
--- a/profiles/default/bsd/fbsd/x86/8.0/make.defaults
+++ b/profiles/default/bsd/fbsd/x86/8.0/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/8.0/make.defaults,v 1.1 2010/03/11 10:29:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/8.0/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 CHOST="i486-gentoo-freebsd8.0"
 
 # Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
 # Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="${USE} java6"
+USE="java6"
diff --git a/profiles/hardened/amd64/multilib/make.defaults b/profiles/hardened/amd64/multilib/make.defaults
index 3c71829b79ba..457c99cd98e5 100644
--- a/profiles/hardened/amd64/multilib/make.defaults
+++ b/profiles/hardened/amd64/multilib/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/multilib/make.defaults,v 1.6 2010/12/12 19:18:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/multilib/make.defaults,v 1.7 2011/02/13 16:53:40 arfrever Exp $
 
 FEATURES="sandbox"
-USE="${USE} multilib"
+USE="multilib"
 MULTILIB_ABIS="x86 amd64"
 DEFAULT_ABI="amd64"
 ABI=${DEFAULT_ABI}
diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
index 17907ac0a1d9..bba2e1dc513f 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/make.defaults,v 1.1 2009/06/06 03:54:48 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 ARCH="x86-macos"
 CHOST="i686-apple-darwin8"
 ACCEPT_KEYWORDS="~x86-macos"
 
-USE="${USE} mmx mmxext sse sse2"
+USE="mmx mmxext sse sse2"
 # set arch to prescott for all MacTel users, as this enables SSE and MMX
 # support in GCC
 CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
index a5a4ce216e04..e79db9c754a0 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/make.defaults,v 1.1 2009/06/06 03:54:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 ARCH="x64-macos"
 CHOST="x86_64-apple-darwin9"
 ACCEPT_KEYWORDS="~x64-macos"
 
-USE="${USE} mmx mmxext sse sse2"
+USE="mmx mmxext sse sse2"
 # set arch to nocona for all MacTel users, as this enables SSE and MMX
 # support in GCC, nocona = Core2Duo = 64-bits
 CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
index 9056e2b40df6..b4a9d97dbe2f 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/make.defaults,v 1.1 2009/06/06 03:54:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 ARCH="x86-macos"
 CHOST="i686-apple-darwin9"
 ACCEPT_KEYWORDS="~x86-macos"
 
-USE="${USE} mmx mmxext sse sse2"
+USE="mmx mmxext sse sse2"
 # set arch to prescott for all MacTel users, as this enables SSE and MMX
 # support in GCC
 CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
index fc6935b1e011..df956e2be15c 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/make.defaults,v 1.1 2009/08/17 09:46:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 ARCH="x64-macos"
 CHOST="x86_64-apple-darwin10"
 ACCEPT_KEYWORDS="~x64-macos"
 
-USE="${USE} mmx mmxext sse sse2"
+USE="mmx mmxext sse sse2"
 # set arch to nocona for all MacTel users, as this enables SSE and MMX
 # support in GCC, nocona = Core2Duo = 64-bits
 CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
index 41ed36a1f2f2..e1e93779c80d 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/make.defaults,v 1.3 2009/09/17 17:30:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/make.defaults,v 1.4 2011/02/13 16:53:40 arfrever Exp $
 
 ARCH="x86-macos"
 CHOST="i686-apple-darwin10"
 ACCEPT_KEYWORDS="~x86-macos"
 
-USE="${USE} mmx mmxext sse sse2"
+USE="mmx mmxext sse sse2"
 # normally we set arch to prescott for all MacTel users, as this enables
 # SSE and MMX support in GCC
 CFLAGS="-march=prescott"
diff --git a/profiles/prefix/linux/make.defaults b/profiles/prefix/linux/make.defaults
index 5901094f2153..363e22eba107 100644
--- a/profiles/prefix/linux/make.defaults
+++ b/profiles/prefix/linux/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/make.defaults,v 1.5 2011/01/28 20:51:17 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/make.defaults,v 1.6 2011/02/13 16:53:40 arfrever Exp $
 
 # 'Sane' defaults
 ELIBC="glibc"
@@ -8,7 +8,7 @@ KERNEL="linux"
 
 # 2006/10/28 - Luca Barbato <lu_zero@gentoo.org>
 # on glibc system you cannot turn it off
-USE="${USE} iconv"
+USE="iconv"
 
 # build gcc with mudflap (pointer checking) and parallelization support
 USE="${USE} mudflap openmp"
diff --git a/profiles/releases/10.0/make.defaults b/profiles/releases/10.0/make.defaults
index 90b846daab70..57d61666aeb6 100644
--- a/profiles/releases/10.0/make.defaults
+++ b/profiles/releases/10.0/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/make.defaults,v 1.1 2009/08/06 06:30:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 # Adding this one, since it makes sense.
-USE="${USE} bzip2"
+USE="bzip2"
diff --git a/profiles/releases/2008.0/make.defaults b/profiles/releases/2008.0/make.defaults
index 2d58d5d1bc67..b3d0e2fad938 100644
--- a/profiles/releases/2008.0/make.defaults
+++ b/profiles/releases/2008.0/make.defaults
@@ -1,7 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/make.defaults,v 1.1 2008/04/01 17:41:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 # Adding this one, since it makes sense.
-USE="${USE} bzip2"
-
+USE="bzip2"
diff --git a/profiles/releases/freebsd-7.2/make.defaults b/profiles/releases/freebsd-7.2/make.defaults
index 726b0243f0f8..ab1d0e6d5057 100644
--- a/profiles/releases/freebsd-7.2/make.defaults
+++ b/profiles/releases/freebsd-7.2/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-7.2/make.defaults,v 1.1 2009/05/17 10:53:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-7.2/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
 
 # Note: CHOST must be *-gentoo-freebsd7.2, so that Gentoo can be recognized in
 # ./configure files.
 # Note: ARCH must be *-fbsd
 
-USE="${USE} ppds"
+USE="ppds"