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

(Portage version: 2.2.00.15800-prefix/cvs/Darwin powerpc)

5 files changed, 15 insertions, 9 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/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}~" \