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

5 files changed, 17 insertions, 24 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/Manifest b/x11-wm/metacity/Manifest
index 992655b12f2e..bc56a5a76f61 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,11 +1,11 @@
 MD5 66e7d5c3d7353513c805f3e731a43676 metacity-2.8.6.ebuild 998
 MD5 634676b37223574247c7abcee92b40c6 metacity-2.8.1.ebuild 879
 MD5 d561a0fe198d90a681bf1777e00937d9 metacity-2.8.5.ebuild 1000
-MD5 7203b287eb7f0597ec876d5dc67ab5fc metacity-2.8.0.ebuild 1383
-MD5 b8c054acc237ca65bc428edcb22074d2 metacity-2.6.3.ebuild 1047
-MD5 a7785fc7ca17aee1132b03051adb6e98 ChangeLog 8200
+MD5 1d0c6152a10ced81079e2122a95cbd8e metacity-2.8.0.ebuild 1108
+MD5 f6b59812d25914a474884f7b791c4c99 metacity-2.6.3.ebuild 1004
+MD5 0368c9eb3e6ca802b9622a8c14a84a98 ChangeLog 8444
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3df3ac465600a8778f3eaec889cf2094 metacity-2.6.5.ebuild 1056
+MD5 a4d312fa0332ab3ffef05469c44ea555 metacity-2.6.5.ebuild 1013
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
 MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
 MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
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
-#	)
-
-
 }