Fix bug #183701 by Viktor Avramov

Package-Manager: portage-2.1.3_rc6

3 files changed, 42 insertions, 50 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index e8aa516ba00a..f390dbf41531 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.159 2007/06/29 18:06:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.160 2007/07/02 15:31:35 cardoe Exp $
+
+  02 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/mythtv-trunk-mcpu-march-2.patch:
+  Fix bug #183701 by Viktor Avramov
 
 *mythtv-0.20.1_p13783 (29 Jun 2007)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 6f23703da841..3ba77dcd984b 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -21,10 +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-2.patch 2373 RMD160 2a25b6c0424a8ba830788106e13f76ec2cd64d18 SHA1 4d0d53bc9547e990bb3f5d04d01d19a09aa96939 SHA256 0beeb68aecf8e23be162b77dbc716ff9f0ad8f9641d2ad9a747bd5281b506e68
+MD5 3e2f895b5b04f7b082966aa24ab710b3 files/mythtv-trunk-mcpu-march-2.patch 2373
+RMD160 2a25b6c0424a8ba830788106e13f76ec2cd64d18 files/mythtv-trunk-mcpu-march-2.patch 2373
+SHA256 0beeb68aecf8e23be162b77dbc716ff9f0ad8f9641d2ad9a747bd5281b506e68 files/mythtv-trunk-mcpu-march-2.patch 2373
 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
@@ -60,10 +60,10 @@ EBUILD mythtv-0.21_pre13775.ebuild 7298 RMD160 4cef19ad5daf86270d36f931092b3184b
 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 29386 RMD160 6b41c870728f175697fc0a1d625e81726de5ed30 SHA1 42e3cea32ee79167a0e7e5930d8c192d5d718b7d SHA256 51ba6159b8c1e92f45f508f6ad47f5dc8344711cc931af068832aca45ed16b09
-MD5 386e285f8c8ba298a7f9de09807dec22 ChangeLog 29386
-RMD160 6b41c870728f175697fc0a1d625e81726de5ed30 ChangeLog 29386
-SHA256 51ba6159b8c1e92f45f508f6ad47f5dc8344711cc931af068832aca45ed16b09 ChangeLog 29386
+MISC ChangeLog 29514 RMD160 a7c58462941ac8f3bb2dd3ced29d805ed44018e8 SHA1 1fbeaf3adeb71aa046afc12cac300b20fcb646f3 SHA256 6d5a1547ca5c01d16fa6ff09e73b365c7f32e168c7ce1799e6969a2e07930a7a
+MD5 6a112edc3ead89f03e9aa8983da2ed05 ChangeLog 29514
+RMD160 a7c58462941ac8f3bb2dd3ced29d805ed44018e8 ChangeLog 29514
+SHA256 6d5a1547ca5c01d16fa6ff09e73b365c7f32e168c7ce1799e6969a2e07930a7a ChangeLog 29514
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -83,7 +83,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGhUpNoeSe8B0zEfwRArXwAJ9W2DOJbwscTQ7xYkgkXq+jQKQodACcCgB2
-2F8gQGNxFEKe8Inq0VRIAAg=
-=b7Bj
+iD8DBQFGiRpgoeSe8B0zEfwRAgdiAJ9wfiEyspXXMN2ouE9Vqyud5olZxgCfY191
+ejllJTFVXT54sYt8gpgzW1Y=
+=EUrc
 -----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
index f57adff3e984..23a6acecb170 100644
--- a/media-tv/mythtv/files/mythtv-trunk-mcpu-march-2.patch
+++ b/media-tv/mythtv/files/mythtv-trunk-mcpu-march-2.patch
@@ -1,79 +1,67 @@
 Index: configure
 ===================================================================
---- configure	(revision 13780)
+--- configure	(revision 13775)
 +++ configure	(working copy)
-@@ -1476,49 +1476,49 @@
- if test $tune != "generic"; then
+@@ -1791,36 +1791,36 @@
+     }
      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
+             warn_altivec enabled 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
+             warn_altivec enabled 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
+             warn_altivec enabled 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
+             warn_altivec enabled PPC75x
          ;;
          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
+             warn_altivec disabled PPC745x
          ;;
          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
+             warn_altivec disabled PPC74xx
          ;;
          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 @@
+             warn_altivec disabled PPC970
              POWERPCMODE="64bits"
          ;;
          sparc64)
 -            ARCHFLAGS="-mcpu=v9 -mtune=v9"
 +            ARCHFLAGS="-march=v9 -mtune=v9"
          ;;               
- 	*)
-             ARCHFLAGS="-mtune=$tune"
-@@ -1536,7 +1536,7 @@
+         bf*) #bf531 bf532 bf533 bf561 bf5xx all get this config
+             add_cflags "-mfdpic"
+@@ -1833,7 +1833,7 @@
  fi
  
- if test x"$cpu_overide" = x"yes"; then
--    ARCHFLAGS="-mcpu=$cpu_raw $ARCHFLAGS"
-+    ARCHFLAGS="-march=$cpu_raw $ARCHFLAGS"
+ if enabled cpu_overide; then
+-    ARCHFLAGS="-mcpu=$arch_raw $ARCHFLAGS"
++    ARCHFLAGS="-march=$arch_raw $ARCHFLAGS"
  fi
  
- # compiler sanity check
+ gnu_make(){
+@@ -2092,7 +2092,7 @@
+ if test x"$tune" = x"generic" -a x"$arch" = x"x86_64" -a x"$cpu_overide" != x"yes"; then
+    ARCHFLAGS="-march=k8"
+ elif test x"$tune" = x"generic" -a x"$arch" = x"sparc64" -a x"$cpu_overide" != x"yes"; then
+-   ARCHFLAGS="-mcpu=ultrasparc -mvis"
++   ARCHFLAGS="-march=ultrasparc -mvis"
+ fi
+ 
+ if enabled proc_error_msg; then