Multilib fix.

Package-Manager: portage-2.1.3.3

3 files changed, 18 insertions, 31 deletions

diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index d46a24df28a3..b6314a417d87 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/bossogg
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.26 2007/08/03 19:00:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.27 2007/08/04 16:42:16 drac Exp $
+
+  04 Aug 2007; Samuli Suominen <drac@gentoo.org> bossogg-0.13.6-r3.ebuild:
+  Multilib fix.
 
   03 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   bossogg-0.13.6-r3.ebuild:
diff --git a/media-sound/bossogg/Manifest b/media-sound/bossogg/Manifest
index 646b998f6793..b442ac0443a3 100644
--- a/media-sound/bossogg/Manifest
+++ b/media-sound/bossogg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bossogg-0.13.6+flac-1.1.3.patch 7420 RMD160 b99dd98a5703021585b9711cc58f128621ffc8fc SHA1 5ef8076fd5760d0fdb7eb66d6f8a7d5de15770ad SHA256 bfbba5d7db0ed6674be2ca58f401c3b475e6e7de43c823dbad7bb988d066500a
 MD5 dd8708456a2771fb0892b1527c7afd10 files/bossogg-0.13.6+flac-1.1.3.patch 7420
 RMD160 b99dd98a5703021585b9711cc58f128621ffc8fc files/bossogg-0.13.6+flac-1.1.3.patch 7420
@@ -35,14 +32,14 @@ EBUILD bossogg-0.13.6-r2.ebuild 1569 RMD160 beb21d219dabe4feed3edb89add7c7e2c1b0
 MD5 438a395498bb89f7a0cde842f947d223 bossogg-0.13.6-r2.ebuild 1569
 RMD160 beb21d219dabe4feed3edb89add7c7e2c1b0e7bd bossogg-0.13.6-r2.ebuild 1569
 SHA256 f8dfd00dd562e42ec0bb8f92f1a66f01fd728ac022461cf25ec5235975679ffe bossogg-0.13.6-r2.ebuild 1569
-EBUILD bossogg-0.13.6-r3.ebuild 1785 RMD160 c2b6538ed12602587e4f83007e56c1da9c3842ad SHA1 a94bf20d5f73f44c33f353e3fdbb0765c0f0b3ca SHA256 b656274e451df72c67088149954ff855f799655dbbca81c5168923566a644142
-MD5 1cc19e5a17dd98742966b5a9da30e0ef bossogg-0.13.6-r3.ebuild 1785
-RMD160 c2b6538ed12602587e4f83007e56c1da9c3842ad bossogg-0.13.6-r3.ebuild 1785
-SHA256 b656274e451df72c67088149954ff855f799655dbbca81c5168923566a644142 bossogg-0.13.6-r3.ebuild 1785
-MISC ChangeLog 4313 RMD160 407bfeb9fd33a4cf423c8e4ded58d6da23a43265 SHA1 567768be21049999f5219fdee2d6ddb27e31c276 SHA256 6eea35fb7dbf4ab14b510a7c925b18f1592cce120ff7319e6cb5279452187ae7
-MD5 79c84dfcceea919cf040521b84362a52 ChangeLog 4313
-RMD160 407bfeb9fd33a4cf423c8e4ded58d6da23a43265 ChangeLog 4313
-SHA256 6eea35fb7dbf4ab14b510a7c925b18f1592cce120ff7319e6cb5279452187ae7 ChangeLog 4313
+EBUILD bossogg-0.13.6-r3.ebuild 1747 RMD160 fb9fc891a02088d1eca87f67013269150569e1eb SHA1 639552c832caf6d2d4aa13d57014deaed28e1a42 SHA256 d09788d2aeec9f31b086a37993f137a9c0c8552f95f9866075ca917c951336ca
+MD5 833371bd75ae5e016304dbe3eaaeb286 bossogg-0.13.6-r3.ebuild 1747
+RMD160 fb9fc891a02088d1eca87f67013269150569e1eb bossogg-0.13.6-r3.ebuild 1747
+SHA256 d09788d2aeec9f31b086a37993f137a9c0c8552f95f9866075ca917c951336ca bossogg-0.13.6-r3.ebuild 1747
+MISC ChangeLog 4401 RMD160 5a1b7680dc0bbb6f8cdc656ad1e202ca0fc62cf0 SHA1 dfeadee299f6a81a3e436295ecd34bd741f5a2c3 SHA256 4dae1c751205ef38a84ca8f247047e52b131b496a3b21221bfae85692c079595
+MD5 14da9a726f28d69e56a7c012c2ee828e ChangeLog 4401
+RMD160 5a1b7680dc0bbb6f8cdc656ad1e202ca0fc62cf0 ChangeLog 4401
+SHA256 4dae1c751205ef38a84ca8f247047e52b131b496a3b21221bfae85692c079595 ChangeLog 4401
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -56,10 +53,3 @@ SHA256 0b5131dd0fa689a2f853a070587925fde243d62b8967dc67269d9ada1d8e4bce files/di
 MD5 c3c44c783dcfd6989059534fe34b5ecb files/digest-bossogg-0.13.6-r3 244
 RMD160 b3eb2c27c364bebfb20b4b8ef50b85aa2b1f8d56 files/digest-bossogg-0.13.6-r3 244
 SHA256 0b5131dd0fa689a2f853a070587925fde243d62b8967dc67269d9ada1d8e4bce files/digest-bossogg-0.13.6-r3 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGs3s7KRy60XGEcJIRAuGFAJ4nXBbN2WUhZ/LVZiKlA/G5RBOkAQCfYfXW
-8KmblKyJpt2d//jg/eMPu1A=
-=J2RL
------END PGP SIGNATURE-----
diff --git a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
index 6c76a946eeeb..80ed07956eea 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.9 2007/08/03 19:00:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.10 2007/08/04 16:42:16 drac Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
+inherit autotools eutils multilib
 
 IUSE="vorbis mad flac"
 
@@ -31,13 +28,11 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}/${P}-Makefile.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
 	epatch "${FILESDIR}/${P}-metadata.patch"
 	epatch "${FILESDIR}/${P}-sigkill.patch"
-
 	eautoreconf
 }
 
@@ -46,15 +41,14 @@ src_compile() {
 	      $(use_enable vorbis) \
 	      $(use_enable flac) \
 	      $(use_enable mad mp3) \
-	      $(use_enable mad id3) || die "could not configure"
-
-	emake -j1 || die "emake failed"
+	      $(use_enable mad id3)
+	emake -j1 || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" \
+		install || die "emake install failed."
 	dodoc README TODO API
-
 	newinitd "${FILESDIR}"/bossogg.initd bossogg
 }