refresh march/mcpu patch

Package-Manager: portage-2.1.3_rc5

4 files changed, 101 insertions, 14 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index ccb723b1053f..841306bc5db3 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.157 2007/06/28 18:54:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.158 2007/06/28 21:49:46 cardoe Exp $
+
+  28 Jun 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/mythtv-trunk-mcpu-march-2.patch, mythtv-0.21_pre13775.ebuild:
+  refresh march/mcpu patch
 
 *mythtv-0.21_pre13775 (28 Jun 2007)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 99402be7e73c..f3ca4a5d7fe8 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -21,6 +21,10 @@ AUX mythtv-0.20-as-needed.patch 4260 RMD160 a81bbadba9a09647ee10a6ba994db855ab72
 MD5 c0cc5944bdcf2d2e2691f97797203dc8 files/mythtv-0.20-as-needed.patch 4260
 RMD160 a81bbadba9a09647ee10a6ba994db855ab72ba09 files/mythtv-0.20-as-needed.patch 4260
 SHA256 cdf55c4847f2f27699947dd863568e638218cfe170bab47647b68997bcf9cfc2 files/mythtv-0.20-as-needed.patch 4260
+AUX mythtv-trunk-mcpu-march-2.patch 2848 RMD160 15a1349889db3465f204931b4fa07818650a6045 SHA1 5a0d25053549554614d6a28a4760cc8453cdf9c1 SHA256 c532980d203eea78782af11dff2e66cd3226b1fc32613cb872d6809e26331592
+MD5 c1650d70c468bb37ff7a70e8d3013d2a files/mythtv-trunk-mcpu-march-2.patch 2848
+RMD160 15a1349889db3465f204931b4fa07818650a6045 files/mythtv-trunk-mcpu-march-2.patch 2848
+SHA256 c532980d203eea78782af11dff2e66cd3226b1fc32613cb872d6809e26331592 files/mythtv-trunk-mcpu-march-2.patch 2848
 AUX mythtv-trunk-mcpu-march.patch 3012 RMD160 34a51c568476945887fe4eff3ec7209c928c321b SHA1 0ec3be699c280e0aab277b56274bc8bad4f4a88e SHA256 592c30836a0359b989a6b66dcfd9f6aaae1e2e88f34a98cfc1a023a176c26266
 MD5 25de6055c471950c0d7e1af535ceb857 files/mythtv-trunk-mcpu-march.patch 3012
 RMD160 34a51c568476945887fe4eff3ec7209c928c321b files/mythtv-trunk-mcpu-march.patch 3012
@@ -47,14 +51,14 @@ EBUILD mythtv-0.21_pre13285.ebuild 7294 RMD160 9f455d3e28aa3e0f0e2a2105d2a085820
 MD5 7f71f8c72c84389d805ca6ea414a22d4 mythtv-0.21_pre13285.ebuild 7294
 RMD160 9f455d3e28aa3e0f0e2a2105d2a085820af86712 mythtv-0.21_pre13285.ebuild 7294
 SHA256 f113298b7d49fbfcce2ef6ddab9c74e12a841551f69375c456d2634127968148 mythtv-0.21_pre13285.ebuild 7294
-EBUILD mythtv-0.21_pre13775.ebuild 7296 RMD160 717111458ebfdd42f09c009856b4b9f047472262 SHA1 7a1ffff0ad44b18f4062bfe54b553cad8139271b SHA256 2e18f9b8e3d79a847db0446ea920060c266f1e78b22c162c948963bc3ee37639
-MD5 47dd0253a44bb5514de099131fbeffd6 mythtv-0.21_pre13775.ebuild 7296
-RMD160 717111458ebfdd42f09c009856b4b9f047472262 mythtv-0.21_pre13775.ebuild 7296
-SHA256 2e18f9b8e3d79a847db0446ea920060c266f1e78b22c162c948963bc3ee37639 mythtv-0.21_pre13775.ebuild 7296
-MISC ChangeLog 29100 RMD160 42756e92f57061b6a6c567e4c374d8e7499470d2 SHA1 f70dca8bce8ac7f64fe2521a9e1618ef29481578 SHA256 e18a55b1bff8972a5f4c731cacf151ca0b2ce0b4c19fa08cea38d8041d6f6e57
-MD5 93152360db6b59a78aac10e2a222909e ChangeLog 29100
-RMD160 42756e92f57061b6a6c567e4c374d8e7499470d2 ChangeLog 29100
-SHA256 e18a55b1bff8972a5f4c731cacf151ca0b2ce0b4c19fa08cea38d8041d6f6e57 ChangeLog 29100
+EBUILD mythtv-0.21_pre13775.ebuild 7298 RMD160 4cef19ad5daf86270d36f931092b3184b0c624f0 SHA1 3bde8cac5949acc071bf1d25eb58b35f04173d95 SHA256 73de418f472a53c73938a12421c9733292f937d5d8ee352e5c8accda4981f381
+MD5 77f3f0cf4c0586451a51c8cf73b7ee59 mythtv-0.21_pre13775.ebuild 7298
+RMD160 4cef19ad5daf86270d36f931092b3184b0c624f0 mythtv-0.21_pre13775.ebuild 7298
+SHA256 73de418f472a53c73938a12421c9733292f937d5d8ee352e5c8accda4981f381 mythtv-0.21_pre13775.ebuild 7298
+MISC ChangeLog 29249 RMD160 b2a837f4590291eed15728aec1f3b352e1a6e166 SHA1 e5b5a9dc562d80f1f2c210db0a7c93bd45b8d41f SHA256 43d91f8b46c69022c621fc77300125c57506242e91a7d92f395fa8510b4fd056
+MD5 2eecb2aefad6b01570b1ebde8fcda486 ChangeLog 29249
+RMD160 b2a837f4590291eed15728aec1f3b352e1a6e166 ChangeLog 29249
+SHA256 43d91f8b46c69022c621fc77300125c57506242e91a7d92f395fa8510b4fd056 ChangeLog 29249
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -71,7 +75,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGhAPwoeSe8B0zEfwRAgEfAJ9NKC4HSO2n6MxfG47C4Y19JTcACQCfeBiA
-SHn4tzHmXyC33BL7J3ceuU8=
-=RJDh
+iD8DBQFGhC0EoeSe8B0zEfwRAjT9AJ9b0zrANS0RSPcfnflgMPKt00/sJgCeK0yc
+eteSy1UEhFRAVXJdvgPecyk=
+=eJHW
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/mythtv-trunk-mcpu-march-2.patch b/media-tv/mythtv/files/mythtv-trunk-mcpu-march-2.patch
new file mode 100644
index 000000000000..f57adff3e984
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-trunk-mcpu-march-2.patch
@@ -0,0 +1,79 @@
+Index: configure
+===================================================================
+--- configure	(revision 13780)
++++ configure	(working copy)
+@@ -1476,49 +1476,49 @@
+ if test $tune != "generic"; then
+     case $tune in
+         601|ppc601|PowerPC601)
+-            ARCHFLAGS="-mcpu=601"
++            ARCHFLAGS="-march=601"
+             if test $altivec = "yes"; then
+                 echo "WARNING: Tuning for PPC601 but AltiVec enabled!";
+             fi
+             TUNECPU=ppc601
+         ;;
+         603*|ppc603*|PowerPC603*)
+-            ARCHFLAGS="-mcpu=603"
++            ARCHFLAGS="-march=603"
+             if test $altivec = "yes"; then
+                 echo "WARNING: Tuning for PPC603 but AltiVec enabled!";
+             fi
+             TUNECPU=ppc603
+         ;;
+         604*|ppc604*|PowerPC604*)
+-            ARCHFLAGS="-mcpu=604"
++            ARCHFLAGS="-march=604"
+             if test $altivec = "yes"; then
+                 echo "WARNING: Tuning for PPC604 but AltiVec enabled!";
+             fi
+             TUNECPU=ppc604
+         ;;
+         G3|g3|75*|ppc75*|PowerPC75*)
+-            ARCHFLAGS="-mcpu=750 -mtune=750 -mpowerpc-gfxopt"
++            ARCHFLAGS="-march=750 -mtune=750 -mpowerpc-gfxopt"
+             if test $altivec = "yes"; then
+                 echo "WARNING: Tuning for PPC75x but AltiVec enabled!";
+             fi
+             TUNECPU=ppc750
+         ;;
+         G4|g4|745*|ppc745*|PowerPC745*)
+-            ARCHFLAGS="-mcpu=7450 -mtune=7450 -mpowerpc-gfxopt"
++            ARCHFLAGS="-march=7450 -mtune=7450 -mpowerpc-gfxopt"
+             if test $altivec = "no"; then
+                 echo "WARNING: Tuning for PPC745x but AltiVec disabled!";
+             fi
+             TUNECPU=ppc7450
+         ;;
+         74*|ppc74*|PowerPC74*)
+-            ARCHFLAGS="-mcpu=7400 -mtune=7400 -mpowerpc-gfxopt"
++            ARCHFLAGS="-march=7400 -mtune=7400 -mpowerpc-gfxopt"
+             if test $altivec = "no"; then
+                 echo "WARNING: Tuning for PPC74xx but AltiVec disabled!";
+             fi
+             TUNECPU=ppc7400
+         ;;
+         G5|g5|970|ppc970|PowerPC970|power4*|Power4*)
+-            ARCHFLAGS="-mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
++            ARCHFLAGS="-march=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
+             if test $altivec = "no"; then
+                 echo "WARNING: Tuning for PPC970 but AltiVec disabled!";
+             fi
+@@ -1526,7 +1526,7 @@
+             POWERPCMODE="64bits"
+         ;;
+         sparc64)
+-            ARCHFLAGS="-mcpu=v9 -mtune=v9"
++            ARCHFLAGS="-march=v9 -mtune=v9"
+         ;;               
+ 	*)
+             ARCHFLAGS="-mtune=$tune"
+@@ -1536,7 +1536,7 @@
+ fi
+ 
+ if test x"$cpu_overide" = x"yes"; then
+-    ARCHFLAGS="-mcpu=$cpu_raw $ARCHFLAGS"
++    ARCHFLAGS="-march=$cpu_raw $ARCHFLAGS"
+ fi
+ 
+ # compiler sanity check
diff --git a/media-tv/mythtv/mythtv-0.21_pre13775.ebuild b/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
index 41d7714abcac..60985625fd5d 100644
--- a/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13775.ebuild,v 1.1 2007/06/28 18:54:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13775.ebuild,v 1.2 2007/06/28 21:49:46 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion
 
@@ -99,7 +99,7 @@ src_unpack() {
 	subversion_src_unpack
 
 	# mcpu to march
-	epatch "${FILESDIR}"/${PN}-trunk-mcpu-march.patch
+	epatch "${FILESDIR}"/${PN}-trunk-mcpu-march-2.patch
 
 	# As needed fix since they don't know how to write qmake let alone a real
 	# make system. And they won't accept this upstream since it comes from