From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Fri, 24 Nov 2006 15:13:07 +0000 (+0000)
Subject: Added multilib support, thanks to Christoph Mende, closes bug#156065
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0fe867cd6cf907e06216a7ac5059c442b9b5b09;p=gentoo.git

Added multilib support, thanks to Christoph Mende, closes bug#156065
Package-Manager: portage-2.1.1-r2
---

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 8c2a1ca6bb09..3d8ceaad353b 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.18 2006/10/24 19:33:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.19 2006/11/24 15:13:07 alonbl Exp $
+
+  24 Nov 2006; Alon Bar-Lev <alonbl@gentoo.org> botan-1.5.11.ebuild:
+  Added multilib support, thanks to Christoph Mende, closes bug#156065
 
 *botan-1.5.11 (24 Oct 2006)
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index ca453e6d136e..9f949946e949 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -32,18 +32,18 @@ EBUILD botan-1.4.9.ebuild 2550 RMD160 8f867a05ca9925e5e642d26d40e368379db84f53 S
 MD5 cc8e69ca2141787b033cbbacac2fac2b botan-1.4.9.ebuild 2550
 RMD160 8f867a05ca9925e5e642d26d40e368379db84f53 botan-1.4.9.ebuild 2550
 SHA256 6b090ffa03a4363704ebe0eb0e05a897b428d32bb4d809842a50002dbe6afb9a botan-1.4.9.ebuild 2550
-EBUILD botan-1.5.11.ebuild 2606 RMD160 5a50baeef02d0c52d6a41e8fb74b1c65c6dfef8a SHA1 ad235fdd0b2f4cc70ad16e93b2091aeff07032d7 SHA256 11785e846698bca34fb4d22f17e8de87c98a3f31085bdd1c9f873f28d4efd625
-MD5 3103be79b7ec497732747801fa65b8e3 botan-1.5.11.ebuild 2606
-RMD160 5a50baeef02d0c52d6a41e8fb74b1c65c6dfef8a botan-1.5.11.ebuild 2606
-SHA256 11785e846698bca34fb4d22f17e8de87c98a3f31085bdd1c9f873f28d4efd625 botan-1.5.11.ebuild 2606
+EBUILD botan-1.5.11.ebuild 2655 RMD160 e2383a16ef5a24e7a41f28e7e843d74aabd60448 SHA1 007d69f870ee28cbc62f9c8002d40b35e604b67c SHA256 7dd5d6269bd1c4a583b4d26edbab79c7ee4dc31ee3e5168627936f5719759c9b
+MD5 72b5eb075a962351e1d1ab9fcfdd0d10 botan-1.5.11.ebuild 2655
+RMD160 e2383a16ef5a24e7a41f28e7e843d74aabd60448 botan-1.5.11.ebuild 2655
+SHA256 7dd5d6269bd1c4a583b4d26edbab79c7ee4dc31ee3e5168627936f5719759c9b botan-1.5.11.ebuild 2655
 EBUILD botan-1.5.5.ebuild 2525 RMD160 e99614a67cc9efe531ba6fdb1fc69cc4590e899d SHA1 a6b124f0ef53eeb72b9501eaaebce77ce25a30cd SHA256 19766b483faaffde71d0b289523b619ebc719d5b0e084d168714b0ee7aefaf53
 MD5 7c02ae041daddf9f9f0115053a78e8a2 botan-1.5.5.ebuild 2525
 RMD160 e99614a67cc9efe531ba6fdb1fc69cc4590e899d botan-1.5.5.ebuild 2525
 SHA256 19766b483faaffde71d0b289523b619ebc719d5b0e084d168714b0ee7aefaf53 botan-1.5.5.ebuild 2525
-MISC ChangeLog 3219 RMD160 8b92459c50aa88b0b37e95ead597659bddf9e6dc SHA1 e700a68fa22ca87b7c1f8ded795f7b135da54e45 SHA256 b77f689983c5bbb0a5d86a4e02eccd393bb1f3ae6c15b798ed06fa21d9d3ea2a
-MD5 eb5f70579bd1ea77b1fddde10c893f6e ChangeLog 3219
-RMD160 8b92459c50aa88b0b37e95ead597659bddf9e6dc ChangeLog 3219
-SHA256 b77f689983c5bbb0a5d86a4e02eccd393bb1f3ae6c15b798ed06fa21d9d3ea2a ChangeLog 3219
+MISC ChangeLog 3360 RMD160 c35fbd82d2635b2f2770ab407c4b5d6d57f7d470 SHA1 69f56847654c71fb35b9485cec7c3998fb26c4dd SHA256 6bcbd8b940841476433556749d748d06d7c78972fee42cd6ecc5dbc54897a4e3
+MD5 b7c8336a53f7f1523fdb87659a5677f4 ChangeLog 3360
+RMD160 c35fbd82d2635b2f2770ab407c4b5d6d57f7d470 ChangeLog 3360
+SHA256 6bcbd8b940841476433556749d748d06d7c78972fee42cd6ecc5dbc54897a4e3 ChangeLog 3360
 MISC metadata.xml 463 RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 SHA1 05f66f0d6e803177100d8fc252fa313e325c3641 SHA256 a5cb191344e60da7f987220e591ee31c12b6c4ca898a03dc83745e51f56c2715
 MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
 RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 metadata.xml 463
diff --git a/dev-libs/botan/botan-1.5.11.ebuild b/dev-libs/botan/botan-1.5.11.ebuild
index 483741a5274c..11ad25eb15c8 100644
--- a/dev-libs/botan/botan-1.5.11.ebuild
+++ b/dev-libs/botan/botan-1.5.11.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/dev-libs/botan/botan-1.5.11.ebuild,v 1.1 2006/10/24 19:33:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.5.11.ebuild,v 1.2 2006/11/24 15:13:07 alonbl Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
@@ -72,7 +72,10 @@ src_compile() {
 	einfo "Enabling modules: " ${modules}
 
 	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
+	./configure.pl \
+		--noauto gcc-linux-${CHOSTARCH} \
+		--libdir=/usr/$(get_libdir) \
+		--modules=$modules ||
 			die "configure.pl failed"
 	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
 }