replace-cpu-flags had args in the wrong order, resulting in p3's being compiled with p4 badness (#60597).

6 files changed, 20 insertions, 14 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 919ce6387840..c12d015df67d 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.93 2004/08/21 10:23:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.94 2004/08/23 03:46:33 spyderous Exp $
+
+  22 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild,
+  xorg-x11-6.7.99.2.ebuild, xorg-x11-6.7.99.902.ebuild:
+  replace-cpu-flags had args in the wrong order, resulting in p3's being
+  compiled with p4 badness (#60597).
 
   21 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
   xorg-x11-6.7.99.902.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 4be07a97a858..32008effa4d1 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,9 +1,9 @@
-MD5 9e6ebeef839a05c27f6daf805b2a1749 xorg-x11-6.7.0-r2.ebuild 38107
-MD5 86bd2abc1a24eab9181a74565233b084 xorg-x11-6.7.99.902.ebuild 39436
-MD5 7d41a3dbef1f1dfcb9944201c27009b9 xorg-x11-6.7.0-r1.ebuild 41872
-MD5 2650567893c554d2743f7704ed98d5d6 xorg-x11-6.7.99.2.ebuild 39437
-MD5 a720c9a62b6f9090a61ce98039fbe5af ChangeLog 22704
+MD5 295b52fc2246e5366a2e1c63326fdf65 ChangeLog 22982
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
+MD5 7fe3d25ff1d20065910e5ec4e116eeb1 xorg-x11-6.7.0-r1.ebuild 41872
+MD5 5f2a8216eef55c641160569b6202d839 xorg-x11-6.7.99.2.ebuild 39439
+MD5 6e82f4a2992a7e64ccb9ed78f058fe96 xorg-x11-6.7.0-r2.ebuild 38107
+MD5 9725555d09a09985cf72592a8dcb73de xorg-x11-6.7.99.902.ebuild 39438
 MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906
 MD5 51c9e80b73eced56c98721ff90648866 files/digest-xorg-x11-6.7.0-r2 904
 MD5 a604c8c88698750bb3b72914dd12b062 files/digest-xorg-x11-6.7.99.2 510
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index aa8fa3779611..0dab810e3694 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.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-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.32 2004/08/02 19:45:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.33 2004/08/23 03:46:33 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -256,7 +256,7 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium4" "pentium3"
+				replace-cpu-flags "pentium3" "pentium4"
 				replace-cpu-flags "athlon-tbird" "athlon"
 			fi
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index 32b595684176..21cbf2c7bfdc 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.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-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.12 2004/08/02 19:45:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.13 2004/08/23 03:46:33 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -236,7 +236,7 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium4" "pentium3"
+				replace-cpu-flags "pentium3" "pentium4"
 				replace-cpu-flags "athlon-tbird" "athlon"
 			fi
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild
index a0fb83d8e70d..dda5df2ac84c 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.2.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-base/xorg-x11/xorg-x11-6.7.99.2.ebuild,v 1.6 2004/08/20 23:27:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild,v 1.7 2004/08/23 03:46:33 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -240,7 +240,7 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium4" "pentium3"
+				replace-cpu-flags "pentium3" "pentium4"
 				replace-cpu-flags "athlon-tbird" "athlon"
 			fi
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild
index 2fa302617ad1..004028ffcd5e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.902.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-base/xorg-x11/xorg-x11-6.7.99.902.ebuild,v 1.2 2004/08/21 10:23:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild,v 1.3 2004/08/23 03:46:33 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -242,7 +242,7 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium4" "pentium3"
+				replace-cpu-flags "pentium3" "pentium4"
 				replace-cpu-flags "athlon-tbird" "athlon"
 			fi