make sure libs are installed into the right libdir; bug 158416

Package-Manager: portage-2.1.2-r7

4 files changed, 25 insertions, 19 deletions

diff --git a/games-emulation/caps/ChangeLog b/games-emulation/caps/ChangeLog
index b58a0b05a961..076e9bd64d5a 100644
--- a/games-emulation/caps/ChangeLog
+++ b/games-emulation/caps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/caps
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/caps/ChangeLog,v 1.10 2006/11/12 11:07:48 pva Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/caps/ChangeLog,v 1.11 2007/02/04 18:32:15 blubb Exp $
+
+  04 Feb 2007; Simon Stelling <blubb@gentoo.org> caps-20060612.ebuild:
+  make sure libs are installed into the right libdir; bug 158416
 
   12 Nov 2006; Peter Volkov <pva@gentoo.org> -caps-20040303.ebuild:
   Removing old caps lib as nobody in portage uses it.
diff --git a/games-emulation/caps/Manifest b/games-emulation/caps/Manifest
index e5d1e022dd2d..741a1f46a9b6 100644
--- a/games-emulation/caps/Manifest
+++ b/games-emulation/caps/Manifest
@@ -1,18 +1,18 @@
 DIST config_uae_ocs13_512c-512s.zip 1613 RMD160 7fcaa4410cf5b9d6f218e2cf7f53cd39339e4acf SHA1 2d02c2ecbaabcf7b64395696cbede3550bffda0a SHA256 972e43dea9b4a14f60fb97eebca9711e3610ea0027807b22dfc01ddc01d24574
 DIST ipfdevlib_linux-20060612.tgz 60265 RMD160 4dec90fd96021cf22ca012487828cad6aae1d6c1 SHA1 85d70262b77d82523603afdfd6ed26c4d9411c41 SHA256 29b436da18b42e23362bb346a2b870ae6ff3c0bd1fa7875610c12484bfe7af83
-DIST ipfdoc102a.zip 264258
-EBUILD caps-20060612.ebuild 1312 RMD160 90ad23e82807b40f45691452aabc3c02ca0bab2f SHA1 2ecd8d9fc892b98c3e759b6115e6603eb2e34ca5 SHA256 2c842009994d2e514a574ebf8ecdcc83badb02d92b394d22f2074c9d4dc34dd5
-MD5 8ae541eded5dd665b2296a1e59724df6 caps-20060612.ebuild 1312
-RMD160 90ad23e82807b40f45691452aabc3c02ca0bab2f caps-20060612.ebuild 1312
-SHA256 2c842009994d2e514a574ebf8ecdcc83badb02d92b394d22f2074c9d4dc34dd5 caps-20060612.ebuild 1312
-MISC ChangeLog 1277 RMD160 75f57be7203b944cff7acac1da5cf11a69658f6c SHA1 8132b7f9d378dbd0dd065df08336b9978ab61d5d SHA256 e5afe6a2ac61691a8b91d362bab636034a8b96699a9db9ed202d79f426f1b4a1
-MD5 adf7a954d3bebb1136efccf9aa50181b ChangeLog 1277
-RMD160 75f57be7203b944cff7acac1da5cf11a69658f6c ChangeLog 1277
-SHA256 e5afe6a2ac61691a8b91d362bab636034a8b96699a9db9ed202d79f426f1b4a1 ChangeLog 1277
+DIST ipfdoc102a.zip 264258 RMD160 3957e9b6755dbec30b5680c090198cb4bfaf299f SHA1 cd9dd2dcc2ffa832c6b33c77f5b813e803a8e7e0 SHA256 7d434bb032b054eaaf256cb4fe1ff82038d839c566918860a2bdc3a2493692d3
+EBUILD caps-20060612.ebuild 1364 RMD160 46a8e10dda6e27ea5adb11d2e23a29d7917566a2 SHA1 1a610a763937868f7bcbc137fe2f770fbc7a5c96 SHA256 29c3d9d99ba24d613c1acbf8fe48bfb238865724d5705dcb34317406c9e12551
+MD5 a3f99053a854d087c3bd0f28bd5db5dd caps-20060612.ebuild 1364
+RMD160 46a8e10dda6e27ea5adb11d2e23a29d7917566a2 caps-20060612.ebuild 1364
+SHA256 29c3d9d99ba24d613c1acbf8fe48bfb238865724d5705dcb34317406c9e12551 caps-20060612.ebuild 1364
+MISC ChangeLog 1416 RMD160 a945af9c1a91447a5707271f8e3e9447903caf2f SHA1 2f182370638fd64860643441842133937461e897 SHA256 c2a2b017378ea3238a749f868a4de4a39e8a642adea8690ed9b41908c6f652d8
+MD5 3eb27c0f3ae3944af56a9c980a7520f5 ChangeLog 1416
+RMD160 a945af9c1a91447a5707271f8e3e9447903caf2f ChangeLog 1416
+SHA256 c2a2b017378ea3238a749f868a4de4a39e8a642adea8690ed9b41908c6f652d8 ChangeLog 1416
 MISC metadata.xml 678 RMD160 641f3a96c7a40dc2d4933e88c467b862d31ebffd SHA1 a7101ff0b60cc822f4f3dd935e864bd086395480 SHA256 dafb98a7b1775389c51ca96be0b998cc1e373a81c219829f7b7761c3a3a7eabb
 MD5 ea59c2f553cd0849ad7161f3a681d9f0 metadata.xml 678
 RMD160 641f3a96c7a40dc2d4933e88c467b862d31ebffd metadata.xml 678
 SHA256 dafb98a7b1775389c51ca96be0b998cc1e373a81c219829f7b7761c3a3a7eabb metadata.xml 678
-MD5 95737540808b90ea4159c85ecb631e8f files/digest-caps-20060612 586
-RMD160 11f155e9b2a97eef2ce7dbfce20f5ac5401172bb files/digest-caps-20060612 586
-SHA256 509ce5b507a0f8d0fa148dea921cab76eeeee3f4161e0bf9d50f314b31bfb24a files/digest-caps-20060612 586
+MD5 f20026992ff8a1111f2109a082d1f530 files/digest-caps-20060612 750
+RMD160 d838ba312687fdf24a1524c72bea7682826ecf17 files/digest-caps-20060612 750
+SHA256 44551febb8705700624be335d7fed63755d53778f2eafce6ca5f3b3dc96fa9bc files/digest-caps-20060612 750
diff --git a/games-emulation/caps/caps-20060612.ebuild b/games-emulation/caps/caps-20060612.ebuild
index 0dd4a1dfbffe..909046f69219 100644
--- a/games-emulation/caps/caps-20060612.ebuild
+++ b/games-emulation/caps/caps-20060612.ebuild
@@ -1,8 +1,9 @@
-# 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/games-emulation/caps/caps-20060612.ebuild,v 1.4 2006/09/09 22:47:30 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/caps/caps-20060612.ebuild,v 1.5 2007/02/04 18:32:15 blubb Exp $
 
-inherit eutils
+use amd64 && ABI=x86
+inherit eutils multilib
 
 DESCRIPTION="Support library that allows third party applications access and use C.A.P.S. images"
 HOMEPAGE="http://www.softpres.org/"
@@ -15,7 +16,7 @@ LICENSE="CAPS"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
-RESTRICT="strip"
+RESTRICT="nostrip"
 
 S="${WORKDIR}"
 
@@ -36,7 +37,7 @@ src_install() {
 			eerror "Unsupported platform"
 			;;
 	esac
-	dosym /usr/lib/libcapsimage.so.2.0 /usr/lib/libcapsimage.so.2
+	dosym /usr/$(get_libdir)/libcapsimage.so.2.0 /usr/$(get_libdir)/libcapsimage.so.2
 
 	insinto /usr/share/${PN}
 	doins OCS_13_1Mb_800_600.uae
diff --git a/games-emulation/caps/files/digest-caps-20060612 b/games-emulation/caps/files/digest-caps-20060612
index c5c7b1960ba4..41cb1cc5357b 100644
--- a/games-emulation/caps/files/digest-caps-20060612
+++ b/games-emulation/caps/files/digest-caps-20060612
@@ -5,3 +5,5 @@ MD5 73b230518ce28d6146ed72c14ec025a6 ipfdevlib_linux-20060612.tgz 60265
 RMD160 4dec90fd96021cf22ca012487828cad6aae1d6c1 ipfdevlib_linux-20060612.tgz 60265
 SHA256 29b436da18b42e23362bb346a2b870ae6ff3c0bd1fa7875610c12484bfe7af83 ipfdevlib_linux-20060612.tgz 60265
 MD5 245a8b5f8dd37819028fe9314f40b6cf ipfdoc102a.zip 264258
+RMD160 3957e9b6755dbec30b5680c090198cb4bfaf299f ipfdoc102a.zip 264258
+SHA256 7d434bb032b054eaaf256cb4fe1ff82038d839c566918860a2bdc3a2493692d3 ipfdoc102a.zip 264258