fixed libddmpeg brokenness on x86, fixes bug #52799

diff --git a/media-libs/libddmpeg/ChangeLog b/media-libs/libddmpeg/ChangeLog
index 74c038b64980e991cbb6451ec5d662527752087c..430818377e8d1e7d9914a3f6e8ea9b2da691704f 100644 (file)
--- a/media-libs/libddmpeg/ChangeLog
+++ b/media-libs/libddmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libddmpeg
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/ChangeLog,v 1.3 2004/03/08 20:45:05 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/ChangeLog,v 1.4 2004/06/03 10:22:15 tester Exp $
+
+  03 Jun 2004; <tester@gentoo.org> libddmpeg-1.6.ebuild:
+  The amd64 test broke building on x86, fixed bug #52799. Also mpu != march.
 
   08 Mar 2004; Jon Portnoy <avenj@gentoo.org> libddmpeg-1.6.ebuild :
   A little messy hackery to compile on AMD64.

diff --git a/media-libs/libddmpeg/Manifest b/media-libs/libddmpeg/Manifest
index 5d34937773abe3b0d871fd74ff70b6394003fc19..76128df9b7e9a0032ff5ab927cca55951f201f88 100644 (file)
--- a/media-libs/libddmpeg/Manifest
+++ b/media-libs/libddmpeg/Manifest
@@ -1,4 +1,4 @@
-MD5 e189e0c157cc6307eba07e717c332635 ChangeLog 584
+MD5 d43d42a334fcdb6f7e2d948e10e49768 libddmpeg-1.6.ebuild 1154
+MD5 89eaac2c202d643999712b716b715e32 ChangeLog 720
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 6506443a430c0a7d86339ebbb029167a libddmpeg-1.6.ebuild 1158
 MD5 d1788f494a9b92493a3a4662b9516442 files/digest-libddmpeg-1.6 64

diff --git a/media-libs/libddmpeg/libddmpeg-1.6.ebuild b/media-libs/libddmpeg/libddmpeg-1.6.ebuild
index b09456dc54f426835fd677712fdef7a3daf459f0..d0eb6e1253fca7daade483d2f23a86be09398d25 100644 (file)
--- a/media-libs/libddmpeg/libddmpeg-1.6.ebuild
+++ b/media-libs/libddmpeg/libddmpeg-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/libddmpeg-1.6.ebuild,v 1.2 2004/03/08 20:45:05 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/libddmpeg-1.6.ebuild,v 1.3 2004/06/03 10:22:15 tester Exp $
 
 inherit flag-o-matic
 
@@ -13,13 +13,15 @@ LICENSE="as-is"
 KEYWORDS="~x86 ~amd64 -*"
 
 src_compile() {
-       local cpu="`get-flag march || get-flag mcpu`"
+       local cpu="`get-flag march`"
        if [ -n "${cpu}" ] ; then
                sed -e "s:-march=i386:-march=${cpu}:" -i "Makefile" || die "sed failed"
        fi
        # We don't want -march=i386 but we do want -fPIC. Quick swap...
        # - avenj@gentoo.org (8 Mar 04)
-       use amd64 && sed -e "s:-march=i386:-fPIC:" -i "Makefile" || die "sed failed"
+       if use amd64; then
+               sed -e "s:-march=i386:-fPIC:" -i "Makefile" || die "sed failed"
+       fi
 
        emake || die "compile problem"
 }