<user> enable portaudio / use a multilib system <timidity> ok.. I'll not download portaudio because it's ppc masked.. but I'll enable the portaudio output / ok, I'll enable lib64 stuff but force a hardcoded lib on you! <compile> For the Motherland! *death*

(Portage version: 2.0.51-r15)

5 files changed, 19 insertions, 14 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index d00916150db5..ab887da9fa13 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.42 2004/12/22 00:03:54 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.43 2005/02/22 21:26:18 chriswhite Exp $
+
+  23 Feb 2005; Chris White <chriswhite@gentoo.org>
+  timidity++-2.13.0-r1.ebuild, timidity++-2.13.0-r2.ebuild,
+  timidity++-2.13.2.ebuild:
+  Fixed ppc portaudio logic and /lib hardcoding (not using get_libdir...)
 
   22 Dec 2004; Joseph Jezak <josejx@gentoo.org> timidity++-2.13.2.ebuild:
   Marked ppc stable.
diff --git a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
index eebf8652ff5c..edca6296b207 100644
--- a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0-r3.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/timidity++/timidity++-2.12.0-r3.ebuild,v 1.16 2004/07/04 23:08:59 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.17 2005/02/22 21:26:18 chriswhite Exp $
 
 inherit gnuconfig eutils
 
diff --git a/media-sound/timidity++/timidity++-2.13.0-r1.ebuild b/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
index ce66ee226494..4b1f4225e5c8 100644
--- a/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.0-r1.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/timidity++/timidity++-2.13.0-r1.ebuild,v 1.10 2004/09/23 21:18:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0-r1.ebuild,v 1.11 2005/02/22 21:26:18 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -59,7 +59,7 @@ src_compile() {
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
 	use oggvorbis && audios="${audios},vorbis"
-	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/$(get_libdir)/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
 	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
diff --git a/media-sound/timidity++/timidity++-2.13.0-r2.ebuild b/media-sound/timidity++/timidity++-2.13.0-r2.ebuild
index 1d1a3807ae81..69f66798eeaf 100644
--- a/media-sound/timidity++/timidity++-2.13.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.0-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/timidity++/timidity++-2.13.0-r2.ebuild,v 1.2 2004/09/23 21:18:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0-r2.ebuild,v 1.3 2005/02/22 21:26:18 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -59,7 +59,7 @@ src_compile() {
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
 	use oggvorbis && audios="${audios},vorbis"
-	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/$(get_libdir)/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
 	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
diff --git a/media-sound/timidity++/timidity++-2.13.2.ebuild b/media-sound/timidity++/timidity++-2.13.2.ebuild
index d3d50fa2f9de..cf372f8b310b 100644
--- a/media-sound/timidity++/timidity++-2.13.2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2.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/timidity++/timidity++-2.13.2.ebuild,v 1.5 2004/12/22 00:03:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.6 2005/02/22 21:26:18 chriswhite Exp $
 
 IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs"
 
@@ -66,10 +66,10 @@ src_compile() {
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
 	use oggvorbis && audios="${audios},vorbis"
-	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/$(get_libdir)/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
-	use portaudio && audios="${audios},portaudio"
+	use portaudio && use !ppc && audios="${audios},portaudio"
 
 	use alsa \
 		&& audios="${audios},alsa" \