Using the toolchain-funcs eclass for handling the detection of CC version, rather than doing it ourselves

4 files changed, 13 insertions, 20 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 556875ae14be..24314ba797e1 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.75 2004/11/04 08:01:59 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.76 2004/11/05 02:54:32 obz Exp $
+
+  05 Nov 2004; Mike Gardiner <obz@gentoo.org> metacity-2.6.3.ebuild,
+  metacity-2.6.5.ebuild, metacity-2.8.0.ebuild:
+  Using the toolchain-funcs eclass for handling the detection of CC version,
+  rather than doing it ourselves, see bug #70119
 
 *metacity-2.8.6 (04 Nov 2004)
 
diff --git a/x11-wm/metacity/metacity-2.6.3.ebuild b/x11-wm/metacity/metacity-2.6.3.ebuild
index fae951d25c93..d0b4d3cb7b7a 100644
--- a/x11-wm/metacity/metacity-2.6.3.ebuild
+++ b/x11-wm/metacity/metacity-2.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.3.ebuild,v 1.8 2004/06/30 14:05:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.3.ebuild,v 1.9 2004/11/05 02:54:32 obz Exp $
 
-inherit gnome2
+inherit gnome2 toolchain-funcs
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
@@ -35,8 +35,7 @@ src_unpack(){
 	# causes ICE on ppc w/ gcc (still)
 	cd ${S}
 	if use ppc; then
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
+		if [ gcc-version != "2.95" ] ; then
 			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
 		fi
 	fi
diff --git a/x11-wm/metacity/metacity-2.6.5.ebuild b/x11-wm/metacity/metacity-2.6.5.ebuild
index fee96c7361f6..6a71e0202c2c 100644
--- a/x11-wm/metacity/metacity-2.6.5.ebuild
+++ b/x11-wm/metacity/metacity-2.6.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.5.ebuild,v 1.8 2004/06/30 14:05:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.5.ebuild,v 1.9 2004/11/05 02:54:32 obz Exp $
 
-inherit gnome2
+inherit gnome2 toolchain-funcs
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
@@ -35,8 +35,7 @@ src_unpack(){
 	# causes ICE on ppc w/ gcc (still)
 	cd ${S}
 	if use ppc; then
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
+		if [ gcc-version != "2.95" ] ; then
 			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
 		fi
 	fi
diff --git a/x11-wm/metacity/metacity-2.8.0.ebuild b/x11-wm/metacity/metacity-2.8.0.ebuild
index fc0657b11876..8d96ef7353e3 100644
--- a/x11-wm/metacity/metacity-2.8.0.ebuild
+++ b/x11-wm/metacity/metacity-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.0.ebuild,v 1.11 2004/08/26 16:32:09 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.0.ebuild,v 1.12 2004/11/05 02:54:32 obz Exp $
 
 inherit gnome2 eutils
 
@@ -42,14 +42,4 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-xinerama_config_test.patch
 	WANT_AUTOCONF=2.5 autoconf || die
 
-#We can remove that one eventually
-	# causes ICE on ppc w/ gcc (still)
-#	use ppc && (
-#		[ -z "${CC}" ] && CC=gcc
-#		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-#			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
-#		fi
-#	)
-
-
 }