Convert USE=nocxx to USE=cxx.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

12 files changed, 64 insertions, 56 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 024a4c9e5809..c2988d068437 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.19 2011/04/02 15:38:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.20 2011/11/13 19:14:53 vapier Exp $
+
+  13 Nov 2011; Mike Frysinger <vapier@gentoo.org>
+  gcc-apple-3.5.0_p3506-r1.ebuild, gcc-apple-4.0.1_p5490-r2.ebuild,
+  gcc-apple-4.0.1_p5493.ebuild, gcc-apple-4.2.1_p5566-r2.ebuild,
+  gcc-apple-4.2.1_p5574.ebuild, gcc-apple-4.2.1_p5646.ebuild,
+  gcc-apple-4.2.1_p5647.ebuild, gcc-apple-4.2.1_p5659.ebuild,
+  gcc-apple-4.2.1_p5664.ebuild, gcc-apple-4.2.1_p5666.ebuild:
+  Convert USE=nocxx to USE=cxx.
 
 *gcc-apple-4.2.1_p5666 (02 Apr 2011)
 
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 73c056d94acb..887587c31bc5 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gcc-apple-4.0.1_p5465-default-altivec.patch 1381 RMD160 e2c62e9cd060538f1ec03cef6487031e7ac88607 SHA1 01131175af3ca748494057f3660947e1d969149f SHA256 699dfea402a5a2d80f8374254a36fc7552f32b5fc25c1d15d9b88b7742874f09
 AUX gcc-apple-4.2.1-autoconf-m4-precious.patch 339 RMD160 4f200f959cddc9877e83a015e3d8b9f87329712c SHA1 be014e546b4ae6c7e523e60c59c100ab6d6571b7 SHA256 1e95837e5b60036fd8b1aad16c3b1847225320da40a3437736166a2f5bc0032a
@@ -25,22 +25,22 @@ DIST gcc_42-5574.tar.gz 24234411 RMD160 d4f3753ef91ae3f9b0481df508f962a567e9810b
 DIST gcc_os_35-3506.tar.gz 35791881 RMD160 6bc96f5078ef02887ab193e6f4b24fc8c95498cb SHA1 73c3657853ac66130a39978a29fa498546d96b68 SHA256 4d50c4dc6a78b1343e3ced2abc4a8ac508bc473dcbca5b01e85418d3896b7363
 DIST libstdcxx-16.tar.gz 64695692 RMD160 c7e90a6091f89c08c3678fe149da9c38187fafcd SHA1 be03b0e08163286ff939643180bf49a90b749bc0 SHA256 a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f
 DIST libstdcxx-39.tar.gz 117081330 RMD160 3ddba697f55590138592cc7c7d0a34f8775acb34 SHA1 7eb2c353525dc8756bc8e3bfcac3e7b47d688358 SHA256 aad6c0b7aa80b8117af1868d502f7aa4d042e5f33cada853a8ba75980391c6bb
-EBUILD gcc-apple-3.5.0_p3506-r1.ebuild 4525 RMD160 2ee75fa752de5fb224d091836d5c4e6e61c7cc0a SHA1 c983d148b3ff618dc4c78fe661439812705cc248 SHA256 0319a7c2d363924a47979f414ef61577febb4b7a5b759d6797af608c3aed614e
-EBUILD gcc-apple-4.0.1_p5490-r2.ebuild 8530 RMD160 43f321eda46adab01c0aa8b39e9c23b262bbba5f SHA1 b572e56fdab9bd8aa25b3dcf691d1758e059bca6 SHA256 4083d8a2a3e8bab279c49c92b8d14710de663cfd2416315d6b5ade0f1cb1208b
-EBUILD gcc-apple-4.0.1_p5493.ebuild 8542 RMD160 e53dadf5d96ca4bb89494ed0f032e1dbfb8667bb SHA1 5470dcd599e434572a00e860c86e0212fa3707a6 SHA256 014c6b7d8737be6efcecb2ac533881cb2cacb932e3a0af8de683e4974ce08c32
-EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10829 RMD160 8999218072ec2f98dca8bb77f9e74c43c414ecc2 SHA1 db70b5dc4b07bb0bad23a08ffea6f2170bc66afb SHA256 9222690406b3ef9f648b89665a1f1a609da5f823a7f368bdd1e844cfceba188f
-EBUILD gcc-apple-4.2.1_p5574.ebuild 10843 RMD160 954e8e1dda7435ed9239aef0a31c22a251299e52 SHA1 52bb5ec4865474177592587f617fa9e112439c91 SHA256 c45309947cdff4e24cc127526ff650585788f569b1200fe3e11e1ecc29b33cdd
-EBUILD gcc-apple-4.2.1_p5646.ebuild 11284 RMD160 fa8565150fcae722e94f0d2e83f54f0206926dc8 SHA1 8e83b44349bc7f0daa7ccb2db917183ddca78a2d SHA256 682aaca8906ab9b23d2c58b37bdbbcd38c3c1422baef6a77008bfa855da94590
-EBUILD gcc-apple-4.2.1_p5647.ebuild 11504 RMD160 24014bc83b6bb5e485c53750e1012ecbb56d89bf SHA1 ad7ec68383a0670f45c0c80212f4ceae028efbef SHA256 77a5849b0a9b82a893dbe12f642b598df1c76cbfb3b6eca8cc610a21d9745f3e
-EBUILD gcc-apple-4.2.1_p5659.ebuild 11450 RMD160 1446e0f0e8788b095e89fb73b8727377ddc3d5a7 SHA1 4f7d22a8a14b6f66764058ba0948eacc7ec61f46 SHA256 d58361d2455f3762df4623f4473e662c2c99f8f2dfe8b4014d9e9ffc8ecf6d6b
-EBUILD gcc-apple-4.2.1_p5664.ebuild 11450 RMD160 6748904276497f3ee6f8b68202ae4928ba533d3e SHA1 342788af648d7aa394eddd59f4c5bcc086c88f70 SHA256 5f49f501116ebdfab28db6c8b8d8241cbc7711dc3276c2181944a53f37489104
-EBUILD gcc-apple-4.2.1_p5666.ebuild 11450 RMD160 8e20576c7e036c56aadb1357f7bf4e4a30826b8e SHA1 00d5ec5e02ff48d082a73eedf78beb408c688c3b SHA256 16f35a2e60fae79c86f5a815d555ebe9aadfa05fde8ac7253789f3c3d927cf51
-MISC ChangeLog 12233 RMD160 fb8b904a677e88f1e728a8b96c67d5b3cf5254a0 SHA1 0655bb5cc09ed7da6b336a249a01d26a85f30952 SHA256 70430dee2bd4a2711a17d9ace81122a381247f526a05320cb358d76817105bd3
+EBUILD gcc-apple-3.5.0_p3506-r1.ebuild 4521 RMD160 32f9eeccb3fb266ea110062a854c4b08e75d9b8d SHA1 d9ce07222efc2acb5a5a868b143e80a407eba34f SHA256 1152765edb93a24d109878f71fdd689f32ab5b852d7435519d82cede01a7506a
+EBUILD gcc-apple-4.0.1_p5490-r2.ebuild 8526 RMD160 4f1f7b09be2aa9041b0f779b0c106bc949eaea0c SHA1 b1dfd0e45146b2786e20255ebdf3388d8acb01c3 SHA256 4823336dfe458cd6290e075e70e876d7201cebff0115f5bc95eab803f74c0c0d
+EBUILD gcc-apple-4.0.1_p5493.ebuild 8538 RMD160 3365edfb5fcf6887d022a1a84eb793bba44982fb SHA1 ae7626c6313ddc81bc8a5e010b0663d64c19d312 SHA256 7d2020df3ba68905d07625235b0aea06a6098c46a40969e837fe4c013104de61
+EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10825 RMD160 6b0243637d320036900733c47a74b902589956e6 SHA1 2e6b84b4ff80e48738c30d6043c85d5ba87b2e23 SHA256 69223955ad08b8b4fc9bd0cb15201579ae24785cef8f7699584c87fa4e164a20
+EBUILD gcc-apple-4.2.1_p5574.ebuild 10839 RMD160 cee12dd3081b2f865d839bb3499c3bcfa3c95142 SHA1 0df7420f47f1e8ee83d181c66fc874f233054cfa SHA256 03fce2292a084fec73ebf200f9b2b53183bc166647bb7ab4fdef184bc4750def
+EBUILD gcc-apple-4.2.1_p5646.ebuild 11280 RMD160 3f8b3341b47a9211c1c0a5d36d0c1847b13e0121 SHA1 f0b88244d8cbe326926ab7d2a20cacfd6a33b658 SHA256 db640dc8716010dbb982dd382e126932f4d1d03b864497526f6c5b0019133676
+EBUILD gcc-apple-4.2.1_p5647.ebuild 11501 RMD160 3c95ac1dee746772398e24d68c8202db1ada5ca5 SHA1 08aa80eaa40a4102cf735d7874b828177f5ae16a SHA256 9dcc7e7dfe7dd434cb0adc98eae98d88ad36af9b3041ca48c5078bfcaf175bdc
+EBUILD gcc-apple-4.2.1_p5659.ebuild 11446 RMD160 5496c8e2d9892f8750db54719c5b0b0eb5cbfa10 SHA1 c4b06663678962f969a69ba0313fa808d38ee8b9 SHA256 8fb2cc8f5eea53c8050351d427584936579f282148695d4f0f01cdef284544ec
+EBUILD gcc-apple-4.2.1_p5664.ebuild 11446 RMD160 8252c4e0441b312a25e7b4b6adb869f242f2e66a SHA1 cfdb7ea57486d7a587c36c98d23e5de7c71f7976 SHA256 7f869ce04f998d53be59872aa2998a2abcf23a918328812a482992ec3a564fbb
+EBUILD gcc-apple-4.2.1_p5666.ebuild 11446 RMD160 567a618d86c0688b556b1f24a551aa20676af632 SHA1 31fd3334bae3d9689182b8f364d048b94df49b80 SHA256 5930d9ce97596428c37539b21851294601c105c4942579a537825b0abd5e798c
+MISC ChangeLog 12634 RMD160 aee2d3435b23f4cb95aeac4e1aaaecbea8836794 SHA1 d611892b25bc6a0389e34d1bc3dfe3458b486d07 SHA256 a6996a486f9366864847ea9dd94a1084ed5b6c465378ad5bb6b4d97bbc9dfb4b
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2XQpIACgkQX3X2B8XHTonXlwCglvW4SXGc/Dayyr8rJ6ayTIzF
-QKQAoJIb18OhBrOhjppOIt5H8Dt8GT99
-=uQmw
+iF4EAREIAAYFAk7AFzsACgkQaC/OocHi7JZTYwD8DLXbgKAFe6lhLX2fiGQBLK69
+8JIR0Xe4jXs8vvNhoO8A/0LpWtu8fFm3FKpQwmYp8kYZkVWMm7q1essAF4w+3FZ8
+=UObV
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild
index a4d589ded859..a4455db36de9 100644
--- a/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild,v 1.2 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild,v 1.3 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="35"
 
 KEYWORDS="~ppc-macos"
 
-IUSE="nls fortran objc nocxx"
+IUSE="nls fortran objc +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use fortran && langs="${langs},f77"
 	use objc && langs="${langs},objc"
 
diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild
index 04f9530c638d..46eac6828dc2 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild,v 1.2 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild,v 1.3 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x86-macos"
 
-IUSE="nls objc objc++ nocxx"
+IUSE="nls objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -72,7 +72,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 
diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
index 0f16aa3d56ea..aebd318268de 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild,v 1.3 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild,v 1.4 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="nls objc objc++ nocxx"
+IUSE="nls objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -72,7 +72,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
index 8219e3c60034..fcdf8cf599f5 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.4 2010/03/26 19:26:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.5 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -124,7 +124,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
index 6c66df8e2af0..182db6fb1676 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.7 2010/03/26 19:26:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.8 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -124,7 +124,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
index da885510fe4b..85a69f021d54 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.8 2010/03/26 19:26:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.9 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -139,7 +139,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
index 5f253ad0de0d..2549c2fccf82 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.9 2010/05/02 14:53:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.10 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -143,7 +143,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild
index 1108bafe8bce..1f5a7e4d1726 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild,v 1.1 2010/05/18 06:42:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild,v 1.2 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -143,7 +143,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
index 0db8410a3fab..b52293e7e2e2 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
@@ -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/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild,v 1.1 2010/08/12 17:58:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild,v 1.2 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -143,7 +143,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild
index e83c15c1f310..4daa701b87ea 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild,v 1.1 2011/04/02 15:38:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild,v 1.2 2011/11/13 19:14:53 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls +openmp objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -143,7 +143,7 @@ src_prepare() {
 
 src_configure() {
 	local langs="c"
-	use nocxx || langs="${langs},c++"
+	use cxx && langs="${langs},c++"
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"