multilib-strict fix

Package-Manager: portage-2.1.2-r11

4 files changed, 39 insertions, 14 deletions

diff --git a/media-sound/jamin/ChangeLog b/media-sound/jamin/ChangeLog
index 1076c99e75d0..e09ded9135c5 100644
--- a/media-sound/jamin/ChangeLog
+++ b/media-sound/jamin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jamin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/ChangeLog,v 1.18 2007/02/03 19:22:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/ChangeLog,v 1.19 2007/02/24 19:16:32 aballier Exp $
+
+  24 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/jamin-0.95.0-multilib-strict.patch, jamin-0.95.0-r2.ebuild:
+  multilib-strict fix
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
index a34fa260a8c4..fdaed6de4d2c 100644
--- a/media-sound/jamin/Manifest
+++ b/media-sound/jamin/Manifest
@@ -13,6 +13,10 @@ AUX jamin-0.9.0-scenes.patch 666 RMD160 6f32b78f4222b5c9f85c33e9e64fbd8bf2bd81ca
 MD5 831ad9b4be45cbf00053c4254f64a055 files/jamin-0.9.0-scenes.patch 666
 RMD160 6f32b78f4222b5c9f85c33e9e64fbd8bf2bd81ca files/jamin-0.9.0-scenes.patch 666
 SHA256 5fbf62d7cba7729e8e167147ef13f2282cd38888f1c58d049c85aae6d2812c5e files/jamin-0.9.0-scenes.patch 666
+AUX jamin-0.95.0-multilib-strict.patch 469 RMD160 d3a902ac7ce9e6208135d661b830e11a27d005c2 SHA1 7a5dd25df9acfa726c77c410945a81809488746a SHA256 a5333b09120b905c6a57436e6d6f70e6eb353df615e423da36c3a171f0bae6f8
+MD5 cd362675074210a044d703ea5746acfe files/jamin-0.95.0-multilib-strict.patch 469
+RMD160 d3a902ac7ce9e6208135d661b830e11a27d005c2 files/jamin-0.95.0-multilib-strict.patch 469
+SHA256 a5333b09120b905c6a57436e6d6f70e6eb353df615e423da36c3a171f0bae6f8 files/jamin-0.95.0-multilib-strict.patch 469
 DIST jamin-0.9.0.tar.gz 725400 RMD160 aed00ab2c409f77f4fbc0eb959c97e984f23a0da SHA1 debe92219ca23990cf55f65130b4eb914dc488d8 SHA256 9c58adc48eac58893d2a7c40a14e96f3eae4433e88a6ec4e349b82a4863a75f6
 DIST jamin-0.95.0.tar.gz 1007290 RMD160 99f2f6d8f86f760f821fa46b53a8baad6a4346e3 SHA1 d991da3fa6f531a1c8b7f6ef764aa13e7e9acbd3 SHA256 762fee88682f27888e46dfb013a9ab5e798533b9b67643ff1d7760501939bb3c
 EBUILD jamin-0.9.0-r1.ebuild 956 RMD160 09490ac5ccfa709b2eaf9b35db2c19163daafebf SHA1 9a6dcab9a821b31b0ee739d4d618b81e52616ed3 SHA256 d67387993cd45177d6df388781d7f58ea699285f316bfe3fbf93e23b8de5c121
@@ -23,18 +27,18 @@ EBUILD jamin-0.95.0-r1.ebuild 871 RMD160 dfc8cfde8aab3ef0978683a11c0f87620eb4c2f
 MD5 d61090a271d16f78652d4bf4175d4623 jamin-0.95.0-r1.ebuild 871
 RMD160 dfc8cfde8aab3ef0978683a11c0f87620eb4c2f9 jamin-0.95.0-r1.ebuild 871
 SHA256 2716f9f6fa2deef6c124a3b5e04e224272651565486171c50aff400e5caa4094 jamin-0.95.0-r1.ebuild 871
-EBUILD jamin-0.95.0-r2.ebuild 951 RMD160 f5f67454065a2d9ad25d1af83600fdade42d741a SHA1 1049e0a26ac2159fddb770b293afeb32e5cfb4a3 SHA256 e3a74cbc13e5f2d1a2a96ffe1cb5a93b1b8934573c4acf0b8ca8b2cc60b9f402
-MD5 30246851005218b856b60bc3c8745d65 jamin-0.95.0-r2.ebuild 951
-RMD160 f5f67454065a2d9ad25d1af83600fdade42d741a jamin-0.95.0-r2.ebuild 951
-SHA256 e3a74cbc13e5f2d1a2a96ffe1cb5a93b1b8934573c4acf0b8ca8b2cc60b9f402 jamin-0.95.0-r2.ebuild 951
+EBUILD jamin-0.95.0-r2.ebuild 1044 RMD160 038c7900d20904373236f1d5433350fed68a862b SHA1 4c7c52925871bd37d48425e5d72a3b24c3c9d51d SHA256 c7a8a467b1b90029107cc541e5a354036e6d6ee94df656d4cadec7ee3e0fb4fc
+MD5 510f5b3f83cb0e65c829f69934b40de5 jamin-0.95.0-r2.ebuild 1044
+RMD160 038c7900d20904373236f1d5433350fed68a862b jamin-0.95.0-r2.ebuild 1044
+SHA256 c7a8a467b1b90029107cc541e5a354036e6d6ee94df656d4cadec7ee3e0fb4fc jamin-0.95.0-r2.ebuild 1044
 EBUILD jamin-0.95.0.ebuild 832 RMD160 51c48308f8f508d0c08b4baeba4f07be8d847de8 SHA1 7fbfcaebdfaa83609f58ee83128c7c3044b3e52c SHA256 5f4736262aa6bb721361737cb7a9532e5f56a5ebb51b08cbe420b87e9e1902a1
 MD5 f78db7e0f94b1c250e9cfe3bdea3b4ec jamin-0.95.0.ebuild 832
 RMD160 51c48308f8f508d0c08b4baeba4f07be8d847de8 jamin-0.95.0.ebuild 832
 SHA256 5f4736262aa6bb721361737cb7a9532e5f56a5ebb51b08cbe420b87e9e1902a1 jamin-0.95.0.ebuild 832
-MISC ChangeLog 2473 RMD160 0e3e385c8ec3a218327169d9be96a496128c1ce8 SHA1 d109d1c0b472175b201f4c2b46367045d914f09f SHA256 8a3efab56c6e7511dd013153664f50c7f7a811b0dcbf57523d0506dc1eca7f40
-MD5 1f859eac96127b7533021068b90bf04b ChangeLog 2473
-RMD160 0e3e385c8ec3a218327169d9be96a496128c1ce8 ChangeLog 2473
-SHA256 8a3efab56c6e7511dd013153664f50c7f7a811b0dcbf57523d0506dc1eca7f40 ChangeLog 2473
+MISC ChangeLog 2616 RMD160 b218aa6c0c4d5ce5e0d0a1c454c31dd84586c465 SHA1 fb3f30b8b15e3a1c0a10bf61102a827ee9ae1cbc SHA256 acd281724b94cd14a58956e791e2c8130536549cfd611a80d3975cc3d2372dfd
+MD5 260423f907757d4b3b9cd2c7afd1d636 ChangeLog 2616
+RMD160 b218aa6c0c4d5ce5e0d0a1c454c31dd84586c465 ChangeLog 2616
+SHA256 acd281724b94cd14a58956e791e2c8130536549cfd611a80d3975cc3d2372dfd ChangeLog 2616
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -54,7 +58,7 @@ SHA256 e30a9edc56634fe8949306b5db1606afcf981f8706f1d1df7da9638e02425354 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxODxAiZjviIA2XgRAka+AKDGT1C6BNMWJKYCeugGv3zGQmQEyACfYtC2
-E8n10Diugv5/f4U9HB9kjk4=
-=lhGz
+iD8DBQFF4I8WvFcC4BYPU0oRAqT+AJ9zohtW5OgRPJXFR/HnCtXpkpEq0QCcC3Wl
+gxaRAvMXJcW1ZbOCFH6EHC8=
+=hBgv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
new file mode 100644
index 000000000000..c5db949929a9
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
@@ -0,0 +1,11 @@
+--- controller/Makefile.in.old	2007-02-24 20:08:10.000000000 +0100
++++ controller/Makefile.in	2007-02-24 20:08:33.000000000 +0100
+@@ -228,7 +228,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ plugin_LTLIBRARIES = jamincont_1912.la
+-plugindir = @prefix@/lib/ladspa
++plugindir = @libdir@/ladspa
+ jamincont_1912_la_CFLAGS = @OSC_CFLAGS@ -I../src
+ jamincont_1912_la_LIBADD = @OSC_LIBS@
+ jamincont_1912_la_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
diff --git a/media-sound/jamin/jamin-0.95.0-r2.ebuild b/media-sound/jamin/jamin-0.95.0-r2.ebuild
index 4a2b072ac7f4..d567a99ce858 100644
--- a/media-sound/jamin/jamin-0.95.0-r2.ebuild
+++ b/media-sound/jamin/jamin-0.95.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r2.ebuild,v 1.1 2006/01/14 11:51:04 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r2.ebuild,v 1.2 2007/02/24 19:16:32 aballier Exp $
 
 inherit eutils
 
@@ -23,6 +23,12 @@ DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
 	>=x11-libs/gtk+-2.0.0
 	osc? ( >=media-libs/liblo-0.5 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-multilib-strict.patch"
+}
+
 src_compile() {
 	econf `use_enable osc` || die "configure failed"
 	emake || die