Removed libg++ USE-flag (bug #148416)

41 files changed, 113 insertions, 70 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cbb8bb86e3fd..228cb552c43a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.562 2007/08/08 18:13:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.563 2007/08/08 19:27:22 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> use.desc:
+  Removed libg++ USE-flag (bug #148416)
 
   08 Aug 2007; Sven Wegener <swegener@gentoo.org> use.local.desc:
   Add local use flags for net-im/centerim.
diff --git a/profiles/default-bsd/ChangeLog b/profiles/default-bsd/ChangeLog
index ec716834417a..5aec3177c2a8 100644
--- a/profiles/default-bsd/ChangeLog
+++ b/profiles/default-bsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.7 2007/06/07 18:00:07 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.8 2007/08/08 19:27:22 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> fbsd/6.2/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   07 Jun 2007; Joe Peterson <lavajoe@gentoo.org> virtuals:
   For FreeBSD, default to the "reference implementation" versions rather
diff --git a/profiles/default-bsd/fbsd/6.2/make.defaults b/profiles/default-bsd/fbsd/6.2/make.defaults
index b58e5722c296..c770800972c9 100644
--- a/profiles/default-bsd/fbsd/6.2/make.defaults
+++ b/profiles/default-bsd/fbsd/6.2/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/make.defaults,v 1.2 2006/10/07 10:57:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/make.defaults,v 1.3 2007/08/08 19:27:22 dev-zero Exp $
 
 # Note: CHOST must be *-gentoo-freebsd6.2, so that Gentoo can be recognized in
 # ./configure files.
 # Note: ARCH must be *-fbsd
 
-USE="cups gdbm gpm libg++ ppds unicode"
+USE="cups gdbm gpm ppds unicode"
diff --git a/profiles/default-linux/alpha/2006.1/make.defaults b/profiles/default-linux/alpha/2006.1/make.defaults
index 437c497b79cc..8b7c65798ebc 100644
--- a/profiles/default-linux/alpha/2006.1/make.defaults
+++ b/profiles/default-linux/alpha/2006.1/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2006.1/make.defaults,v 1.2 2007/02/12 16:09:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2006.1/make.defaults,v 1.3 2007/08/08 19:27:22 dev-zero Exp $
 
 # This will be commented and replaced with just STAGE1_USE="unicode" if we do
 # not end up with a stable glibc 2.4 by 2006.1's release.
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm ldap libg++ nptl nptlonly ppds truetype unicode xml"
+USE="cups gdbm ldap nptl nptlonly ppds truetype unicode xml"
diff --git a/profiles/default-linux/alpha/2007.0/make.defaults b/profiles/default-linux/alpha/2007.0/make.defaults
index 79b2aed3db70..ee8b3a1b64d3 100644
--- a/profiles/default-linux/alpha/2007.0/make.defaults
+++ b/profiles/default-linux/alpha/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2007.0/make.defaults,v 1.1 2007/04/16 20:30:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2007.0/make.defaults,v 1.2 2007/08/08 19:27:23 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/alpha/ChangeLog b/profiles/default-linux/alpha/ChangeLog
index ee36c39ee903..9a39281c72d2 100644
--- a/profiles/default-linux/alpha/ChangeLog
+++ b/profiles/default-linux/alpha/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.66 2007/08/06 17:24:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.67 2007/08/08 19:27:22 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> 2006.1/make.defaults,
+  2007.0/make.defaults, no-nptl/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   06 Aug 2007; Raúl Porcel <armin76@gentoo.org> package.mask, use.mask:
   libggi works again with stable headers
diff --git a/profiles/default-linux/alpha/no-nptl/make.defaults b/profiles/default-linux/alpha/no-nptl/make.defaults
index dc1b98d7501d..34d7560cc712 100644
--- a/profiles/default-linux/alpha/no-nptl/make.defaults
+++ b/profiles/default-linux/alpha/no-nptl/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/no-nptl/make.defaults,v 1.11 2007/02/12 16:09:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/no-nptl/make.defaults,v 1.12 2007/08/08 19:27:23 dev-zero Exp $
 
 STAGE1_USE="-nptl"
 
-USE="alsa apache2 arts bitmap-fonts cups eds encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg -nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
+USE="alsa apache2 arts bitmap-fonts cups eds encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libwww mad mikmod motif mp3 mpeg -nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
diff --git a/profiles/default-linux/amd64/2006.1/make.defaults b/profiles/default-linux/amd64/2006.1/make.defaults
index 6714346db324..16fac87e4679 100644
--- a/profiles/default-linux/amd64/2006.1/make.defaults
+++ b/profiles/default-linux/amd64/2006.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/make.defaults,v 1.6 2007/02/12 16:11:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/make.defaults,v 1.7 2007/08/08 19:27:23 dev-zero Exp $
 
 ABI=amd64
 
@@ -11,4 +11,4 @@ STAGE1_USE="nptl nptlonly unicode"
 
 # General 2006.1 profile settings
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm libg++ nptl nptlonly ppds unicode"
+USE="cups gdbm gpm nptl nptlonly ppds unicode"
diff --git a/profiles/default-linux/amd64/2007.0/make.defaults b/profiles/default-linux/amd64/2007.0/make.defaults
index 7c1e06423ad4..b509eb2ad085 100644
--- a/profiles/default-linux/amd64/2007.0/make.defaults
+++ b/profiles/default-linux/amd64/2007.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/make.defaults,v 1.4 2007/06/19 16:46:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/make.defaults,v 1.5 2007/08/08 19:27:23 dev-zero Exp $
 
 ABI=amd64
 
@@ -9,4 +9,4 @@ STAGE1_USE="nptl nptlonly unicode"
 
 # General 2007.0 profile settings
 # These USE flags are what is common between the various sub-profiles.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index 23f589bfcd27..289c462ccb54 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.103 2007/07/26 03:02:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.104 2007/08/08 19:27:23 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> 2006.1/make.defaults,
+  dev/32bit-userland/make.defaults, 2007.0/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   26 Jul 2007; Alexis Ballier <aballier@gentoo.org> 2007.0/package.use.mask,
   package.use.mask:
diff --git a/profiles/default-linux/amd64/dev/32bit-userland/make.defaults b/profiles/default-linux/amd64/dev/32bit-userland/make.defaults
index 01eda5d6eea0..96c859d41d24 100644
--- a/profiles/default-linux/amd64/dev/32bit-userland/make.defaults
+++ b/profiles/default-linux/amd64/dev/32bit-userland/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/32bit-userland/make.defaults,v 1.2 2007/02/12 16:11:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/32bit-userland/make.defaults,v 1.3 2007/08/08 19:27:23 dev-zero Exp $
 
 DEFAULT_ABI="x86"
 ABI="x86"
@@ -13,7 +13,7 @@ STAGE1_USE="nptl nptlonly unicode"
 
 # General 2006.1 profile settings
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm libg++ nptl nptlonly ppds unicode"
+USE="cups gdbm gpm nptl nptlonly ppds unicode"
 
 FEATURES="multilib-strict"
 MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"
diff --git a/profiles/default-linux/hppa/2007.0/make.defaults b/profiles/default-linux/hppa/2007.0/make.defaults
index 6aef7a86d2af..9c2312e6323d 100644
--- a/profiles/default-linux/hppa/2007.0/make.defaults
+++ b/profiles/default-linux/hppa/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2007.0/make.defaults,v 1.3 2007/04/16 20:36:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2007.0/make.defaults,v 1.4 2007/08/08 19:27:23 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/ia64/2006.0/make.defaults b/profiles/default-linux/ia64/2006.0/make.defaults
index ba61e0bec2ed..cda2f9bfb819 100644
--- a/profiles/default-linux/ia64/2006.0/make.defaults
+++ b/profiles/default-linux/ia64/2006.0/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2006.0/make.defaults,v 1.8 2007/02/12 16:12:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2006.0/make.defaults,v 1.9 2007/08/08 19:27:24 dev-zero Exp $
 
-USE="apache2 cups eds encode foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mikmod motif ogg opengl oss png qt3 qt4 quicktime sdl spell truetype vorbis X xml2 xv"
+USE="apache2 cups eds encode foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libwww mikmod motif ogg opengl oss png qt3 qt4 quicktime sdl spell truetype vorbis X xml2 xv"
diff --git a/profiles/default-linux/ia64/2007.0/make.defaults b/profiles/default-linux/ia64/2007.0/make.defaults
index 79e916937e74..3d9a0cc68fd9 100644
--- a/profiles/default-linux/ia64/2007.0/make.defaults
+++ b/profiles/default-linux/ia64/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2007.0/make.defaults,v 1.1 2007/04/16 20:41:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2007.0/make.defaults,v 1.2 2007/08/08 19:27:24 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/ia64/ChangeLog b/profiles/default-linux/ia64/ChangeLog
index 992f8d4d3751..a9f089c70f10 100644
--- a/profiles/default-linux/ia64/ChangeLog
+++ b/profiles/default-linux/ia64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for ia64 profile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.32 2007/07/02 17:28:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.33 2007/08/08 19:27:23 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> 2006.0/make.defaults,
+  2007.0/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   02 Jul 2007; Raúl Porcel <armin76@gentoo.org> -2004.3/deprecated,
   -2004.3/package.mask, -2004.3/parent, -2005.0/deprecated,
diff --git a/profiles/default-linux/ppc/ChangeLog b/profiles/default-linux/ppc/ChangeLog
index c99d7e20e493..92be8b7b64b2 100644
--- a/profiles/default-linux/ppc/ChangeLog
+++ b/profiles/default-linux/ppc/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for Gentoo/ppc profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.21 2007/07/22 11:06:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.22 2007/08/08 19:27:24 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org>
+  dev/ppc64/2007.0/32bit-userland/make.defaults,
+  dev/ppc64/2007.0/multilib/make.defaults, ppc32/2006.0/make.defaults,
+  ppc32/2006.1/make.defaults, ppc32/2007.0/make.defaults,
+  ppc64/2006.0/32bit-userland/make.defaults,
+  ppc64/2006.0/64bit-userland/make.defaults,
+  ppc64/2006.0/multilib/make.defaults,
+  ppc64/2006.1/32bit-userland/make.defaults,
+  ppc64/2006.1/64bit-userland-gcc4/make.defaults,
+  ppc64/2006.1/64bit-userland/make.defaults,
+  ppc64/2006.1/multilib/make.defaults, ppc64/2007.0/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; 1.0/virtuals,
   1.0_rc/virtuals, 1.2/virtuals, 1.4/virtuals:
diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
index ac5c3db56c64..3ec05d373995 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
@@ -11,7 +11,7 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="${ARCH}"
 
 STAGE1_USE="gcc64 nptl nptlonly unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # While this profile uses multilib functionality it is just to maintain
 # some similarity across profiles this profile is truly for a singe ABI, ppc32.
diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults b/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
index 0dcec1d19c82..1518d11affff 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults,v 1.3 2007/02/12 16:16:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults,v 1.4 2007/08/08 19:27:24 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -13,7 +13,7 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="ppc64"
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # This profile doesn't fully support multilib portage yet.  We still rely
 # on the emul-* packages.  As such, we have -multilib-pkg here to emphasise
diff --git a/profiles/default-linux/ppc/ppc32/2006.0/make.defaults b/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
index 8e0a80764e4d..4bd1ccd200ca 100644
--- a/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
+++ b/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.0/make.defaults,v 1.10 2007/02/12 16:16:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.0/make.defaults,v 1.11 2007/08/08 19:27:24 dev-zero Exp $
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts bitmap-fonts bonobo cdr cups dvd eds emboss encode esd foomaticdb fortran gdbm gif gnome gpm gstreamer gtk gtkhtml imlib jpeg kde ldap libg++ libwww mad mikmod motif mozilla mp3 mpeg ogg opengl pam png qt3 qt4 quicktime ruby sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
+USE="${STAGE1_USE} alsa apache2 apm arts bitmap-fonts bonobo cdr cups dvd eds emboss encode esd foomaticdb fortran gdbm gif gnome gpm gstreamer gtk gtkhtml imlib jpeg kde ldap libwww mad mikmod motif mozilla mp3 mpeg ogg opengl pam png qt3 qt4 quicktime ruby sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
diff --git a/profiles/default-linux/ppc/ppc32/2006.1/make.defaults b/profiles/default-linux/ppc/ppc32/2006.1/make.defaults
index 48d37b37857f..ecbf9f94ac3c 100644
--- a/profiles/default-linux/ppc/ppc32/2006.1/make.defaults
+++ b/profiles/default-linux/ppc/ppc32/2006.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.1/make.defaults,v 1.8 2007/02/12 16:16:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.1/make.defaults,v 1.9 2007/08/08 19:27:24 dev-zero Exp $
 
 STAGE1_USE="unicode nptl nptlonly"
-USE="${STAGE1_USE} alsa apache2 arts bitmap-fonts bonobo cdr cups dvd eds emboss encode esd firefox fortran gdbm gif gnome gpm gstreamer gtk gtkhtml jpeg kde ldap libg++ libwww mad mikmod mozilla mp3 mpeg ogg opengl pam pdf png qt3 qt4 quicktime ruby sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
+USE="${STAGE1_USE} alsa apache2 arts bitmap-fonts bonobo cdr cups dvd eds emboss encode esd firefox fortran gdbm gif gnome gpm gstreamer gtk gtkhtml jpeg kde ldap libwww mad mikmod mozilla mp3 mpeg ogg opengl pam pdf png qt3 qt4 quicktime ruby sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
diff --git a/profiles/default-linux/ppc/ppc32/2007.0/make.defaults b/profiles/default-linux/ppc/ppc32/2007.0/make.defaults
index 9af859dea519..12139926c279 100644
--- a/profiles/default-linux/ppc/ppc32/2007.0/make.defaults
+++ b/profiles/default-linux/ppc/ppc32/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2007.0/make.defaults,v 1.1 2007/04/16 21:14:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2007.0/make.defaults,v 1.2 2007/08/08 19:27:24 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults b/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults
index 410441dad2e7..184546f19204 100644
--- a/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults
@@ -9,6 +9,6 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="gcc64 unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl nptlonly ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl nptlonly ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults b/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults
index dddb42f6869e..7b9c7cde936e 100644
--- a/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults,v 1.7 2007/04/01 05:11:21 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.0/64bit-userland/make.defaults,v 1.8 2007/08/08 19:27:25 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -11,7 +11,7 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # While this profile uses multilib functionality it is just to maintain
 # some similarity across profiles this profile is truly for a singe ABI, ppc64.
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults b/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults
index f90ee14a8317..a7a4d01e1fb0 100644
--- a/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults,v 1.7 2007/04/01 05:12:09 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.0/multilib/make.defaults,v 1.8 2007/08/08 19:27:25 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -11,7 +11,7 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # This profile doesn't fully support multilib portage yet.  We still rely
 # on the emul-* packages.  As such, we have -multilib-pkg here to emphasise
diff --git a/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/make.defaults b/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/make.defaults
index faa90f1a7467..c22479b56841 100644
--- a/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/make.defaults
@@ -9,7 +9,7 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="gcc64 nptl nptlonly unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # While this profile uses multilib functionality it is just to maintain
 # some similarity across profiles this profile is truly for a singe ABI, ppc32.
diff --git a/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults b/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults
index 6cf0cc098fb5..88a2db86764c 100644
--- a/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults,v 1.3 2007/02/12 16:16:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland-gcc4/make.defaults,v 1.4 2007/08/08 19:27:26 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -13,7 +13,7 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="ppc64"
 
 STAGE1_USE="unicode nptl nptlonly"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # While this profile uses multilib functionality it is just to maintain
 # some similarity across profiles this profile is truly for a singe ABI, ppc64.
diff --git a/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults b/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults
index 6f402231f472..774328903d5d 100644
--- a/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults,v 1.6 2007/04/01 05:13:03 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/64bit-userland/make.defaults,v 1.7 2007/08/08 19:27:25 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -11,7 +11,7 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # While this profile uses multilib functionality it is just to maintain
 # some similarity across profiles this profile is truly for a singe ABI, ppc64.
diff --git a/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults b/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults
index 2bc2152df927..b5021a4dcf4f 100644
--- a/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults,v 1.6 2007/04/01 05:13:33 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.1/multilib/make.defaults,v 1.7 2007/08/08 19:27:26 dev-zero Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -11,7 +11,7 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}
 
 STAGE1_USE="unicode"
-USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
+USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk ibm imlib ipv6 jpeg kde libwww mad mikmod motif mp3 mpeg ncurses nls nptl ogg opengl oss pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml xv zlib"
 
 # This profile doesn't fully support multilib portage yet.  We still rely
 # on the emul-* packages.  As such, we have -multilib-pkg here to emphasise
diff --git a/profiles/default-linux/ppc/ppc64/2007.0/make.defaults b/profiles/default-linux/ppc/ppc64/2007.0/make.defaults
index ce17cfddcf60..3014c915a078 100644
--- a/profiles/default-linux/ppc/ppc64/2007.0/make.defaults
+++ b/profiles/default-linux/ppc/ppc64/2007.0/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2007.0/make.defaults,v 1.1 2007/04/16 21:14:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2007.0/make.defaults,v 1.2 2007/08/08 19:27:26 dev-zero Exp $
 
 # Since we don't ever build stages against this profile, STAGE1_USE isn't seti
 # in here, but instead is set in the sub-profiles. We do set USE, though, for
 # the minimal USE that is shared between both 32-bit and 64-bit userlands.
 # Stages 2 and 3 are built against the USE here, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/sparc/ChangeLog b/profiles/default-linux/sparc/ChangeLog
index ffc0bcb221d1..ef50c0778d31 100644
--- a/profiles/default-linux/sparc/ChangeLog
+++ b/profiles/default-linux/sparc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sparc profile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.72 2007/07/30 14:09:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.73 2007/08/08 19:27:26 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org>
+  sparc64/2007.0/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   30 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> +package.mask,
   sparc64/2007.0/package.mask, -sparc64/2007.0/use.mask, use.mask:
diff --git a/profiles/default-linux/sparc/sparc64/2007.0/make.defaults b/profiles/default-linux/sparc/sparc64/2007.0/make.defaults
index 4a694e99ada1..08a7693cc678 100644
--- a/profiles/default-linux/sparc/sparc64/2007.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2007.0/make.defaults,v 1.1 2007/02/12 16:57:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2007.0/make.defaults,v 1.2 2007/08/08 19:27:26 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="cups gdbm gpm libg++ nptl nptlonly ppds unicode"
+USE="cups gdbm gpm nptl nptlonly ppds unicode"
diff --git a/profiles/default-linux/x86/2006.0/make.defaults b/profiles/default-linux/x86/2006.0/make.defaults
index 24bf7e8cd9d3..0ac2a27fb201 100644
--- a/profiles/default-linux/x86/2006.0/make.defaults
+++ b/profiles/default-linux/x86/2006.0/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.0/make.defaults,v 1.15 2007/02/12 16:18:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.0/make.defaults,v 1.16 2007/08/08 19:27:26 dev-zero Exp $
 
-USE="alsa apache2 apm arts cups eds emboss encode esd foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype vorbis X xml xv"
+USE="alsa apache2 apm arts cups eds emboss encode esd foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libwww mad mikmod motif mp3 mpeg nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype vorbis X xml xv"
diff --git a/profiles/default-linux/x86/2006.1/make.defaults b/profiles/default-linux/x86/2006.1/make.defaults
index 5fe1e9665d0c..36b1bdf8ef40 100644
--- a/profiles/default-linux/x86/2006.1/make.defaults
+++ b/profiles/default-linux/x86/2006.1/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.1/make.defaults,v 1.2 2007/02/12 16:18:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.1/make.defaults,v 1.3 2007/08/08 19:27:26 dev-zero Exp $
 
 # This will be commented and replaced with just STAGE1_USE="unicode" if we do
 # not end up with a stable glibc 2.4 by 2006.1's release.
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm libg++ nptl nptlonly ppds unicode"
+USE="cups gdbm gpm nptl nptlonly ppds unicode"
diff --git a/profiles/default-linux/x86/2007.0/make.defaults b/profiles/default-linux/x86/2007.0/make.defaults
index 526133df9127..cdd6ff41e6ba 100644
--- a/profiles/default-linux/x86/2007.0/make.defaults
+++ b/profiles/default-linux/x86/2007.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2007.0/make.defaults,v 1.1 2007/04/13 22:02:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2007.0/make.defaults,v 1.2 2007/08/08 19:27:27 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index fa624a243f51..3ad342876572 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.94 2007/08/03 18:45:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.95 2007/08/08 19:27:26 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> 2006.0/make.defaults,
+  gcc2/make.defaults, 2006.1/make.defaults, 2007.0/make.defaults,
+  dev/2007.1/make.defaults, no-nptl/make.defaults, xbox/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   03 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   +dev/2007.1/desktop/make.defaults, +dev/2007.1/desktop/parent,
diff --git a/profiles/default-linux/x86/dev/2007.1/make.defaults b/profiles/default-linux/x86/dev/2007.1/make.defaults
index 1f20bcb7bca8..836bd47f4ca8 100644
--- a/profiles/default-linux/x86/dev/2007.1/make.defaults
+++ b/profiles/default-linux/x86/dev/2007.1/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2007.1/make.defaults,v 1.1 2007/08/03 18:45:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2007.1/make.defaults,v 1.2 2007/08/08 19:27:27 dev-zero Exp $
 
 # We build stage1 against this
 STAGE1_USE="nptl nptlonly unicode"
 
 # These USE flags are what is common between the various sub-profiles. Stages 2
 # and 3 are built against these, so be careful what you add.
-USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
+USE="acl cups gdbm gpm nptl nptlonly unicode"
diff --git a/profiles/default-linux/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults
index b7e7c1d50bb2..ef65b5f3d32e 100644
--- a/profiles/default-linux/x86/gcc2/make.defaults
+++ b/profiles/default-linux/x86/gcc2/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.20 2006/10/28 13:29:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.21 2007/08/08 19:27:27 dev-zero Exp $
 
-USE="oss apm arts berkdb bitmap-fonts crypt cups emboss encode fortran font-server gdbm gif gpm gtk imlib java jpeg kde libg++ libwww mikmod mmx motif  mpeg ncurses nls oggvorbis opengl pam png python qt3 qt4 quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xv"
+USE="oss apm arts berkdb bitmap-fonts crypt cups emboss encode fortran font-server gdbm gif gpm gtk imlib java jpeg kde libwww mikmod mmx motif  mpeg ncurses nls oggvorbis opengl pam png python qt3 qt4 quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xv"
diff --git a/profiles/default-linux/x86/no-nptl/make.defaults b/profiles/default-linux/x86/no-nptl/make.defaults
index 51634bff41b5..ae051ff32d6f 100644
--- a/profiles/default-linux/x86/no-nptl/make.defaults
+++ b/profiles/default-linux/x86/no-nptl/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/make.defaults,v 1.11 2006/10/28 13:29:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/make.defaults,v 1.12 2007/08/08 19:27:27 dev-zero Exp $
 
 STAGE1_USE="-nptl -nptlonly"
 
-USE="alsa apm arts bitmap-fonts cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg -nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
+USE="alsa apm arts bitmap-fonts cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libwww mad mikmod motif mp3 mpeg -nptl ogg opengl oss png qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
diff --git a/profiles/default-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults
index f49a02c11d0e..23ee2ed2498b 100644
--- a/profiles/default-linux/x86/xbox/make.defaults
+++ b/profiles/default-linux/x86/xbox/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.14 2006/10/28 13:29:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.15 2007/08/08 19:27:27 dev-zero Exp $
 
-USE="oss apm arts berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam png python qt3 qt4 quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xv zlib"
+USE="oss apm arts berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam png python qt3 qt4 quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xv zlib"
 
 PROFILE_ARCH="xbox"
diff --git a/profiles/selinux/alpha/2006.1/make.defaults b/profiles/selinux/alpha/2006.1/make.defaults
index 16e96be8306a..3d4ec0dab094 100644
--- a/profiles/selinux/alpha/2006.1/make.defaults
+++ b/profiles/selinux/alpha/2006.1/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/2006.1/make.defaults,v 1.3 2007/02/12 16:19:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/2006.1/make.defaults,v 1.4 2007/08/08 19:27:27 dev-zero Exp $
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
 #STAGE1_USE="nptl"
 
-USE="alsa apache2 arts avi bitmap-fonts cups eds encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl nptlonly ogg opengl oss pdflib png qt qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
+USE="alsa apache2 arts avi bitmap-fonts cups eds encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libwww mad mikmod motif mp3 mpeg nptl nptlonly ogg opengl oss pdflib png qt qt3 qt4 quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml xv"
diff --git a/profiles/selinux/alpha/ChangeLog b/profiles/selinux/alpha/ChangeLog
index 3bf40448c3de..8c01c30bc637 100644
--- a/profiles/selinux/alpha/ChangeLog
+++ b/profiles/selinux/alpha/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/ChangeLog,v 1.4 2007/05/17 20:17:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/ChangeLog,v 1.5 2007/08/08 19:27:27 dev-zero Exp $
+
+  08 Aug 2007; Tiziano Müller <dev-zero@gentoo.org> 2006.1/make.defaults:
+  Removed libg++ USE-flag (bug #148416)
 
   17 May 2007; Raúl Porcel <armin76@gentoo.org> package.mask:
   Remove useless masks