Portability update by slarti, do not use x86 asm on amd64. Closes bug #78336.

(Portage version: 2.0.51-r13)

4 files changed, 15 insertions, 17 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index abedfc98931c..e7ed5f4af01b 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/musepack-tools
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.14 2004/12/23 00:49:19 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.15 2005/01/17 20:52:11 chainsaw Exp $
+
+*musepack-tools-1.15s-r2 (17 Jan 2005)
+
+  17 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  -musepack-tools-1.15s-r1.ebuild, +musepack-tools-1.15s-r2.ebuild:
+  Portability fix, do not try to use x86 asm on amd64. Closes bug #78336,
+  patch by Tom Martin <slarti@gentoo.org>.
 
   22 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -musepack-tools-1.15r-r2.ebuild:
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 03547a793d21..ab18b64f2adf 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bccc26b80c4d22728136d443f2b18533 musepack-tools-1.15s-r2.ebuild 1562
 MD5 5c12c140718af8f837dffdca5a9eb584 ChangeLog 2559
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6adc63b00779790b07e24de6165627f6 musepack-tools-1.15s-r1.ebuild 1701
+MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r1 68
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
 MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
-MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFByhYgArHZZzCEUG0RAs4PAJ9xAtBu17OdCvIWZCapIvEGA12KegCfVKo0
-b5E1gqc52PKR5s/v7Loephg=
-=eDFz
------END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r1 b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r2
index 8fd08627a75f..8fd08627a75f 100644
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r1
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r2
diff --git a/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild b/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
index 04e3a99b68f4..00b0acfc6aaa 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild,v 1.3 2004/12/19 06:11:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild,v 1.1 2005/01/17 20:52:11 chainsaw Exp $
 
 IUSE="static esd 16bit"
 
@@ -40,7 +40,7 @@ src_unpack() {
 		sed -i 's/LDADD   += -lesd/#LDADD   += -lesd/' Makefile
 	fi
 
-	if ! ( use x86 || use amd64 ); then
+	if ! use x86 ; then
 		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
 	fi