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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 x86_64

4 files changed, 24 insertions, 11 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/Manifest b/media-sound/musepack-tools/Manifest
index 7b8636daf358..b4475bb73aa7 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -4,7 +4,7 @@ AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2
 AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3
 AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
 DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
-EBUILD musepack-tools-1.15v-r1.ebuild 1868 RMD160 c527450f0a392d029bd40c6272225b50b88bd89a SHA1 83cc68c26b1d48f8e381a51a27937cfa85935722 SHA256 cd6776ecc39d8ec6f95f0f59d823061ae1ac0c8b9e9d9fccaa17ae8e14ae6857
-EBUILD musepack-tools-1.15v.ebuild 1809 RMD160 69820ea8b2700c94b33ad4b2c43d60e43cf5a579 SHA1 bb1ef8e143dec042fa0b32caa50e535d91092ac6 SHA256 5495da2fdef82ff7eabb5ac30eefa2a1d72a41b0e44444a80880ba6e93934431
-MISC ChangeLog 6611 RMD160 8f07204deac4810b7d8074f511a9d4a9b6fb29c8 SHA1 4a5e7b8a3fc950f8f25d82a9382d7dbb4855a496 SHA256 347a3495623a2955709c1352a110e5450ed4245c2eef0ed3677cb7a3e6f33662
+EBUILD musepack-tools-1.15v-r1.ebuild 1957 RMD160 1d82bf3b6c2e5017008db28b4147fb5477250611 SHA1 a47d8beaf4b9db0bf963280484b0fc6b6ea6f8f5 SHA256 5e29e8b5f6724caae7c34e58d86c7ad2e0360572b412e2232130d482a6dc4f33
+EBUILD musepack-tools-1.15v.ebuild 1896 RMD160 2967afc82e0d66396f242dd42c6315f61e0ffdce SHA1 41f7e64e55675fa375fd32d48ae7a6d277fb11a9 SHA256 d563579b8008eac17246962e5e8d4e1e87d99b97a188c99a322410694e127ad1
+MISC ChangeLog 6831 RMD160 95154ff4c46b1fb262b8cceb111ca62d5ed3f122 SHA1 3c3f36026886a38b25b823465745a7f98235584d SHA256 a1ead26755e368481c8889701b874e532954a84a40bb74f1d52577252ef3bed3
 MISC metadata.xml 269 RMD160 62382443b3292829e595043c71f5bd6d4402ad26 SHA1 22bb640da7fa718622c95863ce62f2e67a49191d SHA256 cac43becfa1a17ab8a8fc4250f7c67f7400b00d0651c3c75698ca48f040694bd
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