reverse parameter order of replace-cpu-flags #60597

5 files changed, 35 insertions, 25 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 05ec09a99944..9bb30374555f 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 4d111d3706f7958584f9c5efdcf51b29 ChangeLog 29400
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 b4f272da10e65416a8e02a6a6031bfe4 xorg-x11-6.7.0-r1.ebuild 41731
-MD5 51c913a045d2f362e83bedb479ac73d7 xorg-x11-6.7.0-r2.ebuild 38161
-MD5 70856e32a82e53c2dcd4a5b1fdf6cbb5 xorg-x11-6.8.0-r1.ebuild 41369
-MD5 243a541ef2c1e729476144fb469242f8 xorg-x11-6.8.0.ebuild 40194
-MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906
+MD5 ac6b72d618db638a11fa3da1ae8fcbb9 xorg-x11-6.7.0-r1.ebuild 41715
+MD5 c32f9bc44ffd10b49297b4898097096b xorg-x11-6.7.0-r2.ebuild 38142
+MD5 aa612aff58032399123f58489ddc0590 xorg-x11-6.8.0.ebuild 40178
+MD5 52b9fd741ed75d946378c2d0c7a63668 xorg-x11-6.8.0-r1.ebuild 41350
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
+MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906
 MD5 e6dd1c7e4f865e64c01945576857b351 files/digest-xorg-x11-6.8.0 904
 MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r1 906
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBVSM0HTu7gpaalycRAsBzAKDQosxjinBQGRF+aCXXCkDbYDLxwQCgu0MJ
+ZrOKT0KjDtXEG8XP08RD5HM=
+=coXD
+-----END PGP SIGNATURE-----
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 7f607c4fb260..a7e6a8984dd3 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.36 2004/09/22 00:33:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.37 2004/09/25 07:49:56 vapier 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,
@@ -131,7 +131,7 @@ cflag_setup() {
 		# according to ciaranm
 		sparc)	filter-flags "-fomit-frame-pointer" ;;
 		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 1.0 2.0 ;;
+		hppa ) replace-cpu-flags 2.0 1.0 ;;
 	esac
 
 	# Recently there has been a lot of stability problem in Gentoo-land.  Many
@@ -256,14 +256,14 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium3" "pentium4"
-				replace-cpu-flags "athlon-tbird" "athlon"
+				replace-cpu-flags pentium4 pentium3
+				replace-cpu-flags athlon athlon-tbird
 			fi
 
 			# Try a fix for #49310, see #50931 for more info. <spyderous>
 			if [ "`is-flag -fomit-frame-pointer`" ]
 			then
-				replace-cpu-flags "i586" "k6" "k6-2" "k6-3"
+				replace-cpu-flags k6 k6-2 k6-3 i586
 			fi
 
 			# Without this, modules breaks with gcc3
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 73f5fde1873e..0d70f03a7409 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.26 2004/09/22 16:11:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.27 2004/09/25 07:49:56 vapier 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,
@@ -117,7 +117,7 @@ cflag_setup() {
 		# according to ciaranm
 		sparc)	filter-flags "-fomit-frame-pointer" ;;
 		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 1.0 2.0 ;;
+		hppa ) replace-cpu-flags 2.0 1.0 ;;
 	esac
 
 	# Recently there has been a lot of stability problem in Gentoo-land.  Many
@@ -236,14 +236,14 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium3" "pentium4"
-				replace-cpu-flags "athlon-tbird" "athlon"
+				replace-cpu-flags pentium4 pentium3
+				replace-cpu-flags athlon athlon-tbird
 			fi
 
 			# Try a fix for #49310, see #50931 for more info. <spyderous>
 			if [ "`is-flag -fomit-frame-pointer`" ]
 			then
-				replace-cpu-flags "i586" "k6" "k6-2" "k6-3"
+				replace-cpu-flags k6 k6-2 k6-3 i586
 			fi
 
 			# Without this, modules breaks with gcc3
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index c613fdcca4c7..468d3db717a0 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.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.8.0-r1.ebuild,v 1.8 2004/09/22 09:06:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.9 2004/09/25 07:49:56 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -135,7 +135,7 @@ cflag_setup() {
 			fi
 		;;
 		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 1.0 2.0 ;;
+		hppa ) replace-cpu-flags 2.0 1.0 ;;
 	esac
 
 	# Recently there has been a lot of stability problem in Gentoo-land.  Many
@@ -289,8 +289,8 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium3" "pentium4"
-				replace-cpu-flags "athlon-tbird" "athlon"
+				replace-cpu-flags pentium4 pentium3
+				replace-cpu-flags athlon athlon-tbird
 			fi
 
 			#to fix #56702 for now, thanks Spanky
@@ -300,7 +300,7 @@ host_def_setup() {
 			# Try a fix for #49310, see #50931 for more info. <spyderous>
 			if [ "`is-flag -fomit-frame-pointer`" ]
 			then
-				replace-cpu-flags "i586" "k6" "k6-2" "k6-3"
+				replace-cpu-flags k6 k6-2 k6-3 i586
 			fi
 
 			# Without this, modules breaks with gcc3
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
index 4bb6ca32fd6d..7a5753397b24 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.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-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.16 2004/09/22 00:22:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.17 2004/09/25 07:49:56 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -126,7 +126,7 @@ cflag_setup() {
 		# according to ciaranm
 		sparc)	filter-flags "-fomit-frame-pointer" ;;
 		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 1.0 2.0 ;;
+		hppa ) replace-cpu-flags 2.0 1.0 ;;
 	esac
 
 	# Recently there has been a lot of stability problem in Gentoo-land.  Many
@@ -280,8 +280,8 @@ host_def_setup() {
 
 			if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ]
 			then
-				replace-cpu-flags "pentium3" "pentium4"
-				replace-cpu-flags "athlon-tbird" "athlon"
+				replace-cpu-flags pentium4 pentium3
+				replace-cpu-flags athlon athlon-tbird
 			fi
 
 			#to fix #56702 for now, thanks Spanky
@@ -291,7 +291,7 @@ host_def_setup() {
 			# Try a fix for #49310, see #50931 for more info. <spyderous>
 			if [ "`is-flag -fomit-frame-pointer`" ]
 			then
-				replace-cpu-flags "i586" "k6" "k6-2" "k6-3"
+				replace-cpu-flags k6 k6-2 k6-3 i586
 			fi
 
 			# Without this, modules breaks with gcc3