fix multilib-strict bug 154426

Package-Manager: portage-2.1.2-r5

4 files changed, 31 insertions, 21 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index fe3fac9eb193..e4e7d28f57fb 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.35 2007/01/06 01:46:56 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.36 2007/02/03 19:17:34 blubb Exp $
+
+  03 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/ode-0.7-libdir.patch, ode-0.7.ebuild:
+  fix multilib-strict bug 154426
 
   06 Jan 2007; Tristan Heaven <nyhm@gentoo.org> ode-0.6-r1.ebuild:
   Set WANT_AUTOCONF and WANT_AUTOMAKE
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index 008b56bf8aa0..c91cf32f0f24 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ode-0.5-PIC.patch 446 RMD160 126ad67f1163bb6dd1015d8a17212bd8aa6d65fb SHA1 cea2036b395ca5999b407993c3da2cd85dc956fe SHA256 86ebd9204a4d317029d38391a863d7e3feb1ae969818b23ad64d8f01d8bd19be
 MD5 396acb81503d05b97e7dffe8d6c0003e files/ode-0.5-PIC.patch 446
 RMD160 126ad67f1163bb6dd1015d8a17212bd8aa6d65fb files/ode-0.5-PIC.patch 446
@@ -13,6 +10,10 @@ AUX ode-0.7-flags.patch 927 RMD160 fc67d776ba09b9bfdbb0dcddec69e552f3bbe7ff SHA1
 MD5 6f56029693aed838b77a6c636cb87cd1 files/ode-0.7-flags.patch 927
 RMD160 fc67d776ba09b9bfdbb0dcddec69e552f3bbe7ff files/ode-0.7-flags.patch 927
 SHA256 407a60920ee412878bce4dae123f247c11c64eb028f13d8d0329334b81fe6e1f files/ode-0.7-flags.patch 927
+AUX ode-0.7-libdir.patch 427 RMD160 1eed14ed0db3204c52e5fde68fb043e2debdf5e3 SHA1 dac5ea0958c5ff157ca198f10ee1d618505b27c8 SHA256 16a9d54e3167837963e98f1bed527c26f45943b8a4d24d6f8e8f1fb5064949c6
+MD5 433cdcf81b1d1be4f12c764d3c2759bb files/ode-0.7-libdir.patch 427
+RMD160 1eed14ed0db3204c52e5fde68fb043e2debdf5e3 files/ode-0.7-libdir.patch 427
+SHA256 16a9d54e3167837963e98f1bed527c26f45943b8a4d24d6f8e8f1fb5064949c6 files/ode-0.7-libdir.patch 427
 DIST ode-0.5.tgz 1710720 RMD160 3410a842731c1bb24f306f4d23509533664321aa SHA1 f13756f1192d24101b6d1a3c14feb43efbf0b281 SHA256 5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c
 DIST ode-src-0.6.zip 1808849 RMD160 47f156ff618dc0ea49ba17756dc51f362b8b9f91 SHA1 e6af7548e68ca391f9f586409a9cb9b4203066f7 SHA256 5bc01923bd68b122368f15d4e969bff4d53acbd69af521712b33181d47b36b88
 DIST ode-src-0.7.zip 1903503 RMD160 6215cc2b825321abdf3c9113a2711c6092590e06 SHA1 89d1593fd530e222c9d4aef3820414d4c0b0206b SHA256 e346097fc41174038a4373d4e6295b04c7dcfaf10489f4c385bd2c0878fbc878
@@ -24,14 +25,14 @@ EBUILD ode-0.6-r1.ebuild 2293 RMD160 e1d33d552c6650d58b340ece11897b4220568475 SH
 MD5 0d8e0ea4b1b9c9edb9e846d98d37135f ode-0.6-r1.ebuild 2293
 RMD160 e1d33d552c6650d58b340ece11897b4220568475 ode-0.6-r1.ebuild 2293
 SHA256 47733e24211e6d826ea4917158e15ceff76d9170fcd2c6f0e547eece155dbf00 ode-0.6-r1.ebuild 2293
-EBUILD ode-0.7.ebuild 2229 RMD160 ce724fa619a9e950d0342d9777d46a13bc70b672 SHA1 e6b5d202eba75d49e6c1fb905392a38a15f4b1df SHA256 ba5a87d52967d335d45eba2e1d40cbd40c8d61e4a5098b6667836d66138ad8c2
-MD5 9b60a82aafefa4ad98e7008aa7a34f51 ode-0.7.ebuild 2229
-RMD160 ce724fa619a9e950d0342d9777d46a13bc70b672 ode-0.7.ebuild 2229
-SHA256 ba5a87d52967d335d45eba2e1d40cbd40c8d61e4a5098b6667836d66138ad8c2 ode-0.7.ebuild 2229
-MISC ChangeLog 5164 RMD160 bb67e3158f67cf139f6a5016f8387388db62482b SHA1 98053702b6600414bd974e9da45da45bb5df570c SHA256 6ec6906a67a393c3f28a708793d199ec384b3362d4e4b9ad74b0628ba958741c
-MD5 e7b4c4b1072656c971337a75b54c92d6 ChangeLog 5164
-RMD160 bb67e3158f67cf139f6a5016f8387388db62482b ChangeLog 5164
-SHA256 6ec6906a67a393c3f28a708793d199ec384b3362d4e4b9ad74b0628ba958741c ChangeLog 5164
+EBUILD ode-0.7.ebuild 2270 RMD160 03ff4605b427a05784e3e4f704635ca1c6b5363f SHA1 67805f54c3ef28f2e01005a5fd95e2854e6960f8 SHA256 3b64793f354dc835923081a629c023888b8861f8852121c12c5c0060b12520e0
+MD5 356a62a25b26d29b7d890938e77d9a55 ode-0.7.ebuild 2270
+RMD160 03ff4605b427a05784e3e4f704635ca1c6b5363f ode-0.7.ebuild 2270
+SHA256 3b64793f354dc835923081a629c023888b8861f8852121c12c5c0060b12520e0 ode-0.7.ebuild 2270
+MISC ChangeLog 5295 RMD160 817049055bdc48d047f49db98badb6ba770af0e9 SHA1 dc02c6068cb0ebec0ae9e60f6a51dbc190c0c374 SHA256 4cc427dba07da27d1acd36c5994ef3b3201f78160c3af9c8f0c06d1beb47e89b
+MD5 56e82767c3b227916162b0c416873da2 ChangeLog 5295
+RMD160 817049055bdc48d047f49db98badb6ba770af0e9 ChangeLog 5295
+SHA256 4cc427dba07da27d1acd36c5994ef3b3201f78160c3af9c8f0c06d1beb47e89b ChangeLog 5295
 MISC metadata.xml 507 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a SHA1 2844b71e1f83503d096e912d5d61d6b69b296a99 SHA256 b8638b82f39c6329cfeeab46ec0a1cf325a28f880ce4b87e19b0586d41bd58de
 MD5 2149b6065a52ec18bd6db2bea63d5b9a metadata.xml 507
 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a metadata.xml 507
@@ -45,10 +46,3 @@ SHA256 6cf98cd14d6644e7965eb9ef54d4a7f7ee96ae1fca10e324a2bfb6463bd42131 files/di
 MD5 1c6096d1eea2832d17394318ca60a919 files/digest-ode-0.7 229
 RMD160 2526b9732db87e25510d3f072c989816ae55fbec files/digest-ode-0.7 229
 SHA256 1e961751b99ad3d6ede233ab170ec1dff47d6b2bde0ad034f41cd57f1e6e20fd files/digest-ode-0.7 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnv+Wdz7hIScOURERAub7AJ9OqF0CmNsPphHPI0t/EA6c031F4ACgtCwm
-WvIZ86DxpuwwEPMhj74I2lM=
-=j5+G
------END PGP SIGNATURE-----
diff --git a/dev-games/ode/files/ode-0.7-libdir.patch b/dev-games/ode/files/ode-0.7-libdir.patch
new file mode 100644
index 000000000000..c05f6918c899
--- /dev/null
+++ b/dev-games/ode/files/ode-0.7-libdir.patch
@@ -0,0 +1,11 @@
+--- ode/src/Makefile.am.orig    2007-02-03 20:09:21.000000000 +0100
++++ ode/src/Makefile.am 2007-02-03 20:09:31.000000000 +0100
+@@ -11,7 +11,7 @@
+ # Fake an executable in order to get a shared library
+ # Note the elegant and cunning way to trick Autotools to install a program
+ # in a lib directory. --Rodrigo
+-traplibdir=$(prefix)/lib
++traplibdir=$(prefix)/$(libdir)
+ EXEEXT=@so_ext@
+ traplib_PROGRAMS=libode
+ libode_SOURCES=
diff --git a/dev-games/ode/ode-0.7.ebuild b/dev-games/ode/ode-0.7.ebuild
index bbebe1ea0a18..8c8c9d5f4dad 100644
--- a/dev-games/ode/ode-0.7.ebuild
+++ b/dev-games/ode/ode-0.7.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/dev-games/ode/ode-0.7.ebuild,v 1.2 2006/10/30 10:11:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.7.ebuild,v 1.3 2007/02/03 19:17:34 blubb Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -32,6 +32,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-libdir.patch
 	eautoreconf
 
 	sed -i -e "s/..\/..\/drawstuff\/textures/\/usr\/share\/${PF}\/examples/" ode/test/*.c*