fix wrt multilib-strict; bug 144588

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 15 insertions, 22 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index e4550706e58a..a4cd4df69dff 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.45 2006/07/12 13:13:58 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.46 2006/10/06 16:00:37 blubb Exp $
+
+  06 Oct 2006; Simon Stelling <blubb@gentoo.org> bestcrypt-1.6_p5.ebuild:
+  fix wrt multilib-strict; bug 144588
 
   12 Jul 2006; Danny van Dyk <kugelfang@gentoo.org> bestcrypt-1.6_p5.ebuild:
   QA: Added pcmcia to IUSE, as it is used by linux-mod.eclass.
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index d7c872ae381a..36cf7f9b7dfd 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bcrypt3 3246 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f SHA1 04433a0504b3ec85b083a531acb09e3a608b22e6 SHA256 83296e7fb84845ee0a177b9bc2d88caddb66440b38c3505fc91061873b2a45b3
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f files/bcrypt3 3246
@@ -20,14 +17,14 @@ SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b files/be
 DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 SHA1 527cc86e82b65326f6b9fa37ce44ced970b19ae8 SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd
 DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA1 ed23242a81d7681b887951be67019a24780c978a SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
 DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA1 f82278c22678e7dedb74bf6bbc202702fbe3f988 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
-EBUILD bestcrypt-1.6_p5.ebuild 3260 RMD160 1913ba907cba5b7b3239f290d61e689a6aba39c4 SHA1 d22967d70db802c32d0311289b634d4158c7cbfa SHA256 7e4992267ea8e5e2bc07920f97382e2451e9de84f082a33637ea973498704ea9
-MD5 b70303e0465e55bd0dc9e91464dd707b bestcrypt-1.6_p5.ebuild 3260
-RMD160 1913ba907cba5b7b3239f290d61e689a6aba39c4 bestcrypt-1.6_p5.ebuild 3260
-SHA256 7e4992267ea8e5e2bc07920f97382e2451e9de84f082a33637ea973498704ea9 bestcrypt-1.6_p5.ebuild 3260
-MISC ChangeLog 9294 RMD160 41fb376629a01aebbe25ee81612017e525992b7b SHA1 2508760c05b2216e703da549934a40fa041975e0 SHA256 51c74586e30c6e9ed6f1eb71f333d99e35ac1c6552b1cf21a4ddde120949b248
-MD5 1501ea8e1e7caecebdf9f1445bb8772d ChangeLog 9294
-RMD160 41fb376629a01aebbe25ee81612017e525992b7b ChangeLog 9294
-SHA256 51c74586e30c6e9ed6f1eb71f333d99e35ac1c6552b1cf21a4ddde120949b248 ChangeLog 9294
+EBUILD bestcrypt-1.6_p5.ebuild 3275 RMD160 c887c127c1feca45983a75b97666b3b0b97097f6 SHA1 5955b9a724387aa50c8522595f0dcc568fae0083 SHA256 c2161b20f5cc1d5d1607d9a306bbfef5596ffc70ada91331a6546ad96eb9e03b
+MD5 26c6f2ca0c0e74dc8d1eead65c78559c bestcrypt-1.6_p5.ebuild 3275
+RMD160 c887c127c1feca45983a75b97666b3b0b97097f6 bestcrypt-1.6_p5.ebuild 3275
+SHA256 c2161b20f5cc1d5d1607d9a306bbfef5596ffc70ada91331a6546ad96eb9e03b bestcrypt-1.6_p5.ebuild 3275
+MISC ChangeLog 9403 RMD160 c524368adcdb03661403ab1d9a78875453cb1afe SHA1 48c3f03d0ee91d1e2c5e943368ca648241bd5253 SHA256 46299ea8ea60544ffcb758e24c5286a5582a399b4c9efed7ffb66edfa604650f
+MD5 ce91772939ad45ef1ceffd870697e40f ChangeLog 9403
+RMD160 c524368adcdb03661403ab1d9a78875453cb1afe ChangeLog 9403
+SHA256 46299ea8ea60544ffcb758e24c5286a5582a399b4c9efed7ffb66edfa604650f ChangeLog 9403
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -35,10 +32,3 @@ SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata
 MD5 dd170d28f62e65e70cd3cf160e0d9861 files/digest-bestcrypt-1.6_p5 759
 RMD160 acebddcb31cb47ea345067db1e487d10f5068496 files/digest-bestcrypt-1.6_p5 759
 SHA256 a3d6af6139630204aa7a115bdb7e889a0d75751948b27461b66f610b6db7d60d files/digest-bestcrypt-1.6_p5 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEtPgv5mJXAu5GbtIRApz+AJ9dudXl+99QqGoxzcAdr0GJ6uKwlQCggxjt
-jZRSXOatBSmtPSL09FlLu2c=
-=Nssp
------END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
index ee5781117e13..e05f26104af1 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.4 2006/07/12 13:13:58 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.5 2006/10/06 16:00:37 blubb Exp $
 
-inherit flag-o-matic eutils linux-mod toolchain-funcs
+inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
 
 MY_PN="bcrypt"
 DESCRIPTION="commercially licensed transparent filesystem encryption"
@@ -85,7 +85,7 @@ src_install() {
 	done
 
 	# bug 107392
-	insinto /usr/lib
+	insinto /usr/$(get_libdir)
 	doins lib/libkgsha{,256}.so
 
 	doman man/bctool.8