12 files changed, 43 insertions, 22 deletions
diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index e1bf033e684c..236d5aef3186 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gnump3d
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.23 2004/09/14 16:31:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.24 2004/10/07 03:27:43 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
+  get_libdir fixes.
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
   Stable amd64, sparc.
diff --git a/media-sound/gnump3d/gnump3d-2.8.ebuild b/media-sound/gnump3d/gnump3d-2.8.ebuild
index b75cd53637ce..b5b73915c3e9 100644
--- a/media-sound/gnump3d/gnump3d-2.8.ebuild
+++ b/media-sound/gnump3d/gnump3d-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.8.ebuild,v 1.4 2004/09/14 16:31:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.8.ebuild,v 1.5 2004/10/07 03:27:43 eradicator Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ DEPEND="sys-apps/sed"
 
 RDEPEND=">=dev-lang/perl-5.8.0"
 
-LIBDIR=/usr/lib/gnump3d
+LIBDIR=/usr/$(get_libdir)/gnump3d
 
 pkg_setup() {
 	enewuser gnump3d '' '' '' nogroup || die
diff --git a/media-sound/jack/ChangeLog b/media-sound/jack/ChangeLog
index 9e524c81c5e8..d45f4652c238 100644
--- a/media-sound/jack/ChangeLog
+++ b/media-sound/jack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/jack
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.10 2004/09/15 19:38:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.11 2004/10/07 03:28:39 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
+  get_libdir fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
   Stable sparc.
diff --git a/media-sound/jack/jack-3.0.0.ebuild b/media-sound/jack/jack-3.0.0.ebuild
index 3a960bbdc457..51105ac32f81 100644
--- a/media-sound/jack/jack-3.0.0.ebuild
+++ b/media-sound/jack/jack-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.10 2004/09/15 19:38:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.11 2004/10/07 03:28:39 eradicator Exp $
 
 IUSE=""
 
@@ -37,8 +37,8 @@ src_install() {
 	dobin jack
 
 	distutils_python_version
-	dodir /usr/lib/python${PYVER}/site-packages
-	insinto /usr/lib/python${PYVER}/site-packages
+	dodir /usr/$(get_libdir)/python${PYVER}/site-packages
+	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
 	doins jack_*py
 
 	newman jack.man jack.1
diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 496cdf05a2c0..e6340831ce5c 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/solfege
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.7 2004/09/03 18:22:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.8 2004/10/07 03:30:00 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  solfege-2.0.5.ebuild:
+  get_libdir fixes.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.5.ebuild:
   Stable amd64, x86.
diff --git a/media-sound/solfege/solfege-2.0.5.ebuild b/media-sound/solfege/solfege-2.0.5.ebuild
index 04877dc49fa1..76559b0c0348 100644
--- a/media-sound/solfege/solfege-2.0.5.ebuild
+++ b/media-sound/solfege/solfege-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.5.ebuild,v 1.2 2004/09/03 18:22:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.5.ebuild,v 1.3 2004/10/07 03:30:00 eradicator Exp $
 
 inherit python
 
@@ -35,7 +35,7 @@ pkg_setup() {
 	#  which needs X11, and breaks in console)
 	use gtkhtml \
 		&& python_version \
-		&& [ ! -f ${ROOT}usr/lib/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
+		&& [ ! -f ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
 		&& eerror "Could not find the GTKHtml2 python module, whereas gtkhml is in your flags." \
 		&& eerror "Please re-emerge \"dev-python/gnome-python\" with \"gtkhtml\" USE flag on." \
 		&& die "You will have to re-emerge gnome-python."
diff --git a/media-sound/tapiir/ChangeLog b/media-sound/tapiir/ChangeLog
index 442d8b866277..f31ff02a2d7d 100644
--- a/media-sound/tapiir/ChangeLog
+++ b/media-sound/tapiir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tapiir
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.11 2004/09/15 17:38:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.12 2004/10/07 03:30:37 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tapiir-0.7.1.ebuild:
+  get_libdir fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> tapiir-0.7.1.ebuild:
   Stable amd64.
diff --git a/media-sound/tapiir/tapiir-0.7.1.ebuild b/media-sound/tapiir/tapiir-0.7.1.ebuild
index 2e3b55c02d25..db61dfed999b 100644
--- a/media-sound/tapiir/tapiir-0.7.1.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.11 2004/09/15 17:38:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.12 2004/10/07 03:30:37 eradicator Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--with-fltk-prefix=/usr/lib/fltk-1.1 \
+	myconf="--with-fltk-prefix=/usr/$(get_libdir)/fltk-1.1 \
 		--with-fltk-inc-prefix=/usr/include/fltk-1.1"
 	econf ${myconf} || die
 	emake || die
diff --git a/media-sound/waif/ChangeLog b/media-sound/waif/ChangeLog
index 03ae17af1076..936487cca2f3 100644
--- a/media-sound/waif/ChangeLog
+++ b/media-sound/waif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/waif
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.18 2004/09/15 17:43:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.19 2004/10/07 03:31:20 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
+  get_libdir fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
   Stable amd64, sparc.
diff --git a/media-sound/waif/waif-0.59.7.ebuild b/media-sound/waif/waif-0.59.7.ebuild
index f28fa0e83c0a..0985f23bc00e 100644
--- a/media-sound/waif/waif-0.59.7.ebuild
+++ b/media-sound/waif/waif-0.59.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.7.ebuild,v 1.11 2004/09/15 17:43:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.7.ebuild,v 1.12 2004/10/07 03:31:20 eradicator Exp $
 
 IUSE="xmms oggvorbis"
 
@@ -46,7 +46,7 @@ src_install() {
 	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's:^.*"\(.*\)".*:\1:')
 
 	cd ${S}
-	insinto /usr/lib/tcl${tclv}/Waif
+	insinto /usr/$(get_libdir)/tcl${tclv}/Waif
 	doins Waif/*
 
 	into /usr
diff --git a/media-sound/wavesurfer/ChangeLog b/media-sound/wavesurfer/ChangeLog
index 6543a1f1739b..88530a82d2a9 100644
--- a/media-sound/wavesurfer/ChangeLog
+++ b/media-sound/wavesurfer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/wavesurfer
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.11 2004/09/03 20:30:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.12 2004/10/07 03:32:13 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavesurfer-1.7.ebuild:
+  get_libdir fixes.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   wavesurfer-1.7.ebuild:
diff --git a/media-sound/wavesurfer/wavesurfer-1.7.ebuild b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
index 004340916d66..572a265fe1ed 100644
--- a/media-sound/wavesurfer/wavesurfer-1.7.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.ebuild,v 1.3 2004/09/03 20:30:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.ebuild,v 1.4 2004/10/07 03:32:13 eradicator Exp $
 
 DESCRIPTION="tool for recording, playing, editing, viewing and labeling of audio"
 HOMEPAGE="http://www.speech.kth.se/wavesurfer/"
@@ -24,12 +24,12 @@ src_install() {
 	local mydir="wsurf${PV}"
 
 	newbin wavesurfer.tcl wavesurfer
-	dodir /usr/lib/${mydir}
-	cp -r ${mydir} ${D}/usr/lib/
+	dodir /usr/$(get_libdir)/${mydir}
+	cp -r ${mydir} ${D}/usr/$(get_libdir)/
 
-	insinto /usr/lib/${mydir}/plugins
+	insinto /usr/$(get_libdir)/${mydir}/plugins
 	doins plugins/*.plug
-	insinto /usr/lib/${mydir}/icons
+	insinto /usr/$(get_libdir)/${mydir}/icons
 	doins icons/*
 
 	dodoc README.txt