Fix version hacking, Apple actually parses it back again to set __APPLE_CC__ to their build number. Fixes bug #308659

Package-Manager: portage-2.2.00.15800-prefix/cvs/Darwin powerpc

6 files changed, 20 insertions, 14 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index a36105d6b92a..4bb5452284d9 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.11 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.12 2010/03/09 17:53:25 grobian Exp $
+
+  09 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  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:
+  Fix version hacking, Apple actually parses it back again to set
+  __APPLE_CC__ to their build number. Fixes bug #308659
 
 *gcc-apple-4.2.1_p5647 (08 Mar 2010)
 
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 721217478142..152cced2da61 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -21,9 +21,9 @@ DIST libstdcxx-39.tar.gz 117081330 RMD160 3ddba697f55590138592cc7c7d0a34f8775acb
 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 10763 RMD160 48b140efef228710a7f78db523046f2403652fd0 SHA1 dc8e74d0f66492a9c34244ef36bc08582af4aa72 SHA256 270b887285de655edb2e7fa186850beb62063c09b7b16a1d00b99ccbb0fd05aa
-EBUILD gcc-apple-4.2.1_p5574.ebuild 10777 RMD160 c7bbf01173dd9ceed7d78149a7af0d241042b372 SHA1 de0f8f12c9984b4bcec099f619554897361338e7 SHA256 81957c45b66a0cf8a3b172c160436d6d25c9e4a20b2dc958842c958a8e97bb2a
-EBUILD gcc-apple-4.2.1_p5646.ebuild 11223 RMD160 fcc55837fe7d32a1467ac128fa931bbcc29e4b40 SHA1 8de3c7b1f705b0e98b35baa6f17ecc2689a42441 SHA256 01f2946f257bd148e5d04a6ca55bc8ca6c89cae4ff9c760d9db32d40b1091d92
-EBUILD gcc-apple-4.2.1_p5647.ebuild 11263 RMD160 1474935bce3bcbefb7e477b581747cae929bc2b6 SHA1 42cbf444bfe3168cbb6354200a19c972679e6507 SHA256 a5ddcbcd9e85ff60447d5ff016a687caeb8d5f9c9d0e70f0352f6a8c106f7137
-MISC ChangeLog 10546 RMD160 ebabde67561fba8d663039dac42d429c3b9a3d74 SHA1 b096ec97943e6a6b525c2b869d64610d33f7782d SHA256 3bda5b5163dc555f4086ee39e819d90fd4565a6c1dd92143320d4df01e82ffff
+EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10763 RMD160 452b7b40768c8ff31ea5b8169d5ef68211e8c8d3 SHA1 6a2a925eea790840cd01b374a44b806485722ff1 SHA256 2040615b97abee9917e95ee7cd2764242bedabb05180c7b7c999ecf7aa703457
+EBUILD gcc-apple-4.2.1_p5574.ebuild 10777 RMD160 b70aad820c70cdc808baa4e2345e82bf5532f5a0 SHA1 d233cd182e11be54cb087daa1bd2003d59f2389f SHA256 12658a729831f0f94553053a57d529fefb8db2f56e3e56d5d3b1eb2a237df651
+EBUILD gcc-apple-4.2.1_p5646.ebuild 11223 RMD160 e89084a0e7c4c000ac43bc675abf0bebeb644e59 SHA1 15aac674c442c3f0fb3e4cca2fe074a4b03ab43f SHA256 31821b842f6a275889314c017b76dca2811075c5aa27005a0a57a8f595af3d42
+EBUILD gcc-apple-4.2.1_p5647.ebuild 11263 RMD160 e060f24b53d3b75e539ba57407e3f41fb7a2c157 SHA1 4d3033a768d15f1e6ae1ee0a0350c42e7cb29e86 SHA256 c448bc69cf55f2a4cbdb4688418a7b2cf2428109e1312680d35728fba0d1a77e
+MISC ChangeLog 10847 RMD160 aceebb113c49c1509ce4f1db9ae67cb1c446aa33 SHA1 4bbe57182bf3c14372a6d97c6aa8709e4d8a320d SHA256 c22ab6b0bfadfc7d0e5ccc3a031044de368df869fcf4ca0e792a304c53e18505
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
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 b3f3ab19df0d..3b023487f98d 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
 # 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.2 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.3 2010/03/09 17:53:25 grobian Exp $
 
 EAPI="3"
 
@@ -112,7 +112,7 @@ src_prepare() {
 	cd "${S}"/libgomp && eautoconf
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/)/, Gentoo ${PVR})}
+	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
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 294f930c2ddf..14f8c8449183 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
 # 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.5 2010/03/08 17:12:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.6 2010/03/09 17:53:25 grobian Exp $
 
 EAPI="3"
 
@@ -112,7 +112,7 @@ src_prepare() {
 	cd "${S}"/libgomp && eautoconf
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/)/, Gentoo ${PVR})}
+	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
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 2177a2670a4b..357204e7d851 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
 # 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.3 2010/03/08 18:20:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.4 2010/03/09 17:53:25 grobian Exp $
 
 EAPI="3"
 
@@ -124,7 +124,7 @@ src_prepare() {
 	cd "${S}"/libgomp && eautoconf
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/)/, Gentoo ${PVR})}
+	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
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 98cfa2fa1b65..45da26ca839c 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
 # 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.2 2010/03/08 18:20:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.3 2010/03/09 17:53:25 grobian Exp $
 
 EAPI="3"
 
@@ -124,7 +124,7 @@ src_prepare() {
 	cd "${S}"/libgomp && eautoconf
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/)/, Gentoo ${PVR})}
+	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \