From b2d54501025cadaa9d3a9301f9dcb0786fba2d15 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 15 Nov 2006 22:19:01 +0000
Subject: [PATCH] move gcc2-flags() out of flag-o-matic.eclass to here
 Package-Manager: portage-2.1.2_rc1-r6

---
 sys-devel/gcc/Manifest             | 14 +++++++-------
 sys-devel/gcc/gcc-2.95.3-r9.ebuild | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 24f419399073..acdf43717452 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -368,10 +368,10 @@ DIST protector-3.3-7.tar.gz 25068 RMD160 6e01b53477aec0c0b7a958827a38fcc8bee61c5
 DIST protector-3.3.2-3.tar.gz 28195 RMD160 6e6c98ab3d1ff0d16405df8dfdded0ff1f098eb2 SHA1 80826beb60747a6fb7ec7fdd1a5c1f93d625abba SHA256 e89ce49af8a088ffa790985e57bb5c2dd59328676342ddce93ae3166c2d3b9d9
 DIST protector-3.3.5.20050130-1.tar.gz 24324 RMD160 5c221415fda8795a5062cc4ce749d8d2494f9084 SHA1 fb5221179ce1328c0a96a276a57cbeb5f5993b1c SHA256 c5b0e5620ac2e30dc79b156db2165865e987a2ce529cffb6f1a695eb60c462d0
 DIST protector-3.4-2.tar.gz 31066 RMD160 bbb7aeabc8308b7ab3e296923019e810f38c3305 SHA1 a4defea3acd00328f4a204124da591d045a7c0b1 SHA256 a9decc15da37c84dc7ce50f44ceb528fd6592a405109f4e3be089b58e6c14a70
-EBUILD gcc-2.95.3-r9.ebuild 7557 RMD160 25b82fb59db9537bf2f24d4e926d67456ec4f1d2 SHA1 4c59ed885302fc3f91f7583cc8871eef93839df0 SHA256 de06c18c79522ba23e349a934b2aaf2e8b8f09b2941ef0343e3f71d4805803cf
-MD5 5ca59966c8fbff64f7c0a9fc852832cf gcc-2.95.3-r9.ebuild 7557
-RMD160 25b82fb59db9537bf2f24d4e926d67456ec4f1d2 gcc-2.95.3-r9.ebuild 7557
-SHA256 de06c18c79522ba23e349a934b2aaf2e8b8f09b2941ef0343e3f71d4805803cf gcc-2.95.3-r9.ebuild 7557
+EBUILD gcc-2.95.3-r9.ebuild 7901 RMD160 c370d79c16e1cd641a9b8858d1abec987d82de36 SHA1 1eb4594c8d07a1d2d28a26b7af24db70d80dff0d SHA256 d8bf44e949ed8d0f004d46eef9f99a411b6151e4bb7cb27f3c1f2272520036be
+MD5 22697b99a169131365644493509b4637 gcc-2.95.3-r9.ebuild 7901
+RMD160 c370d79c16e1cd641a9b8858d1abec987d82de36 gcc-2.95.3-r9.ebuild 7901
+SHA256 d8bf44e949ed8d0f004d46eef9f99a411b6151e4bb7cb27f3c1f2272520036be gcc-2.95.3-r9.ebuild 7901
 EBUILD gcc-3.1.1-r2.ebuild 9210 RMD160 206881516627ab93359924637597ea1675c132fd SHA1 1743ac9b185d94574d55170cdaab3305ba052260 SHA256 86f05a36ba0410c596362c239179a15d6e27efeb8dafb05eb607df4b57b1c8b2
 MD5 db581eca2beab85843437f12caf5d43e gcc-3.1.1-r2.ebuild 9210
 RMD160 206881516627ab93359924637597ea1675c132fd gcc-3.1.1-r2.ebuild 9210
@@ -554,7 +554,7 @@ SHA256 6224fe924651e924a994cb507ae2b0cd5775c99a83d3dfd025da6bb0eb6d4522 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFW4utwUpWvClEHQoRAkvMAJ9cvlz+CItykAbOVWoU9LOh+WkBoACdEetE
-rtNat9BOeK3ZiiHnbY7JW7E=
-=iUli
+iD8DBQFFW5J1amhnQswr0vIRAmNaAKC6OOiJWRL+mMSxcuHFvhBclUWm8ACeLhpz
+RCX0UXyIL2IumoBQAIxB/0E=
+=BkyJ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-2.95.3-r9.ebuild b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
index 1bb580170d6d..675d7a3edfca 100644
--- a/sys-devel/gcc/gcc-2.95.3-r9.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.4 2006/04/13 05:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.5 2006/11/15 22:19:01 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator fixheadtails gnuconfig
 
@@ -18,7 +18,20 @@ do_filter_flags() {
 
 	# Are we trying to compile with gcc3 ?  CFLAGS and CXXFLAGS needs to be
 	# valid for gcc-2.95.3 ...
-	gcc2-flags
+	if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
+		CFLAGS=${CFLAGS//-mtune=/-mcpu=}
+		CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
+	fi
+
+	replace-cpu-flags k6-{2,3} k6
+	replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
+
+	replace-cpu-flags pentium-mmx i586
+	replace-cpu-flags pentium{2,3,4} i686
+
+	replace-cpu-flags ev6{7,8} ev6
+
+	export CFLAGS CXXFLAGS
 }
 
 export CTARGET=${CTARGET:-${CHOST}}
-- 
2.26.2