(non maintainer commit) 64 bit fix as presented in bug #188160. Thanks to Rene Treffer for the patch

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 x86_64)

3 files changed, 21 insertions, 8 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index bedecb7e82be..8d32353aa53d 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/musepack-tools
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.33 2007/05/14 21:21:37 beandog Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.34 2008/12/09 03:26:00 darkside Exp $
+
+  09 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  musepack-tools-1.15v.ebuild, musepack-tools-1.15v-r1.ebuild:
+  (non maintainer commit) 64 bit fix as presented in bug #188160. Thanks to
+  Rene Treffer for the patch
 
   14 May 2007; Steve Dibb <beandog@gentoo.org>
   musepack-tools-1.15v-r1.ebuild:
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
index 84476b52fc44..a48a9210267c 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.15v-r1.ebuild,v 1.2 2007/05/14 21:21:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild,v 1.3 2008/12/09 03:26:00 darkside Exp $
 
 IUSE="static 16bit esd"
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-Makefile.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
@@ -46,6 +46,10 @@ src_unpack() {
 		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
 	fi
 
+	if [[ "$(tc-arch)" == "amd64" ]] ; then
+		sed -i 's/-f elf$/-f elf64/' Makefile
+	fi
+
 	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
 
 	# Bug #109699; console redirection to /dev/tty makes no sense
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index e3e517ecaca0..229003b4f7c2 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.15v.ebuild,v 1.10 2006/12/26 18:02:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.11 2008/12/09 03:26:00 darkside Exp $
 
 IUSE="static 16bit esd"
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-Makefile.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
@@ -45,6 +45,10 @@ src_unpack() {
 		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
 	fi
 
+	if [[ "$(tc-arch)" == "amd64" ]] ; then
+		sed -i 's/-f elf$/-f elf64/' Makefile
+	fi
+
 	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
 
 	# Bug #109699; console redirection to /dev/tty makes no sense