multilib fixes.

10 files changed, 36 insertions, 16 deletions

diff --git a/media-plugins/xmms-midi/ChangeLog b/media-plugins/xmms-midi/ChangeLog
index c63c44aef032..9d561ba6b4bd 100644
--- a/media-plugins/xmms-midi/ChangeLog
+++ b/media-plugins/xmms-midi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-midi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-midi/ChangeLog,v 1.10 2004/09/15 19:27:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-midi/ChangeLog,v 1.11 2004/10/07 03:19:45 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-midi-0.03.ebuild:
+  multilib fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-midi-0.03.ebuild:
diff --git a/media-plugins/xmms-midi/xmms-midi-0.03.ebuild b/media-plugins/xmms-midi/xmms-midi-0.03.ebuild
index a69b71e35d3d..44ae460fb5e4 100644
--- a/media-plugins/xmms-midi/xmms-midi-0.03.ebuild
+++ b/media-plugins/xmms-midi/xmms-midi-0.03.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-plugins/xmms-midi/xmms-midi-0.03.ebuild,v 1.13 2004/09/15 19:27:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-midi/xmms-midi-0.03.ebuild,v 1.14 2004/10/07 03:19:45 eradicator Exp $
 
 IUSE=""
 
@@ -20,13 +20,13 @@ DEPEND="media-sound/xmms
 src_compile() {
 	gnuconfig_update
 	econf \
-		--prefix=/usr/lib || die "econf failed"
+		--prefix=/usr/$(get_libdir) || die "econf failed"
 		--with-xmms-prefix=/usr/include/xmms
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} libdir=/usr/lib/xmms/Input install || die
+	make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die
 	dodoc AUTHORS COPYING NEWS README
 }
 
diff --git a/media-plugins/xmms-shn/ChangeLog b/media-plugins/xmms-shn/ChangeLog
index 19942d27284e..ab036cc6e049 100644
--- a/media-plugins/xmms-shn/ChangeLog
+++ b/media-plugins/xmms-shn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-shn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shn/ChangeLog,v 1.8 2004/09/03 08:59:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shn/ChangeLog,v 1.9 2004/10/07 03:20:32 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-shn-2.4.0.ebuild:
+  multilib fixes.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-shn-2.4.0.ebuild:
diff --git a/media-plugins/xmms-shn/xmms-shn-2.4.0.ebuild b/media-plugins/xmms-shn/xmms-shn-2.4.0.ebuild
index c6e9fbce0b99..0523ca53f622 100644
--- a/media-plugins/xmms-shn/xmms-shn-2.4.0.ebuild
+++ b/media-plugins/xmms-shn/xmms-shn-2.4.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-plugins/xmms-shn/xmms-shn-2.4.0.ebuild,v 1.2 2004/09/03 08:59:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shn/xmms-shn-2.4.0.ebuild,v 1.3 2004/10/07 03:20:32 eradicator Exp $
 
 IUSE=""
 
@@ -16,6 +16,6 @@ KEYWORDS="x86 ~ppc -sparc ~alpha ~hppa ~mips amd64"
 DEPEND="media-sound/xmms"
 
 src_install() {
-	make DESTDIR=${D} libdir=/usr/lib/xmms/Input install || die
+	make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die
 	dodoc AUTHORS COPYING NEWS README
 }
diff --git a/media-plugins/xmms-sndfile/ChangeLog b/media-plugins/xmms-sndfile/ChangeLog
index ab0ee664e2ed..7e32f2fd434d 100644
--- a/media-plugins/xmms-sndfile/ChangeLog
+++ b/media-plugins/xmms-sndfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-sndfile
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sndfile/ChangeLog,v 1.6 2004/09/15 19:31:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sndfile/ChangeLog,v 1.7 2004/10/07 03:21:18 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-sndfile-1.2.ebuild:
+  multilib fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-sndfile-1.2.ebuild:
diff --git a/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild b/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild
index 73f30225c565..1c8163fab2d9 100644
--- a/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild
+++ b/media-plugins/xmms-sndfile/xmms-sndfile-1.2.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-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild,v 1.5 2004/09/15 19:31:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sndfile/xmms-sndfile-1.2.ebuild,v 1.6 2004/10/07 03:21:18 eradicator Exp $
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
@@ -19,6 +19,6 @@ DEPEND="media-libs/libsndfile
 	media-sound/xmms"
 
 src_install() {
-	make DESTDIR=${D} libdir=/usr/lib/xmms/Input install || die
+	make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die
 	dodoc AUTHORS NEWS README ChangeLog TODO
 }
diff --git a/media-plugins/xmms-spc/ChangeLog b/media-plugins/xmms-spc/ChangeLog
index 2319134d78dd..59dcb16a895b 100644
--- a/media-plugins/xmms-spc/ChangeLog
+++ b/media-plugins/xmms-spc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-spc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/ChangeLog,v 1.10 2004/09/03 09:00:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/ChangeLog,v 1.11 2004/10/07 03:22:03 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-spc-0.2.1-r1.ebuild:
+  multilib fixes.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-spc-0.2.1-r1.ebuild:
diff --git a/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild b/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild
index d0e2e291fcf7..09de569425d5 100644
--- a/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild
+++ b/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.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-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild,v 1.2 2004/09/03 09:00:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-spc/xmms-spc-0.2.1-r1.ebuild,v 1.3 2004/10/07 03:22:03 eradicator Exp $
 
 IUSE=""
 
@@ -38,6 +38,6 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR=${D} libdir=/usr/lib/xmms/Input install || die
+	make DESTDIR=${D} libdir=`xmms-config --input-plugin-dir` install || die
 	dodoc AUTHORS COPYING NEWS README
 }
diff --git a/media-plugins/xmms-xmmsd/ChangeLog b/media-plugins/xmms-xmmsd/ChangeLog
index 716675199518..9eae5e996fda 100644
--- a/media-plugins/xmms-xmmsd/ChangeLog
+++ b/media-plugins/xmms-xmmsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-xmmsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsd/ChangeLog,v 1.2 2004/09/05 08:00:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsd/ChangeLog,v 1.3 2004/10/07 03:22:48 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-xmmsd-0.3.ebuild:
+  multilib fixes.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/media-plugins/xmms-xmmsd/xmms-xmmsd-0.3.ebuild b/media-plugins/xmms-xmmsd/xmms-xmmsd-0.3.ebuild
index 82a88015a25b..1f0be3fb9032 100644
--- a/media-plugins/xmms-xmmsd/xmms-xmmsd-0.3.ebuild
+++ b/media-plugins/xmms-xmmsd/xmms-xmmsd-0.3.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-plugins/xmms-xmmsd/xmms-xmmsd-0.3.ebuild,v 1.1 2004/07/26 07:51:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsd/xmms-xmmsd-0.3.ebuild,v 1.2 2004/10/07 03:22:48 eradicator Exp $
 
 IUSE=""
 
@@ -26,7 +26,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall XMMS_GENERAL_PLUGIN_DIR=${D}/usr/lib/xmms/General || die
+	einstall XMMS_GENERAL_PLUGIN_DIR=${D}`xmms-config --general-plugin-dir` || die
 
 	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS \
 		README README.libtaglist THANKS TODO