fix wrt multilib-strict and re-add ~amd64; bug 168571

Package-Manager: portage-2.1.2-r9

3 files changed, 18 insertions, 12 deletions

diff --git a/sci-electronics/gnucap/ChangeLog b/sci-electronics/gnucap/ChangeLog
index 6369f6b9283a..433e3b60d635 100644
--- a/sci-electronics/gnucap/ChangeLog
+++ b/sci-electronics/gnucap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gnucap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.33 2007/02/27 12:31:28 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.34 2007/02/27 13:27:38 blubb Exp $
+
+  27 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  gnucap-0.35.20070221.ebuild:
+  fix wrt multilib-strict and re-add ~amd64; bug 168571
 
 *gnucap-0.35.20070221 (27 Feb 2007)
 
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index a626a397a0ae..195a3a38b357 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -5,10 +5,10 @@ DIST gnucap-2007-02-21-bsim-models.tar.gz 2997708 RMD160 9db7f0cb6b9c1c7418e0af4
 DIST gnucap-2007-02-21-ngspice17-models.tar.gz 2310474 RMD160 04380271580ed0dfc9bafd353f43d1cc0f7cc7e4 SHA1 bee0700e990829c31428198b1773e53907716c8e SHA256 cd4a24df7b23244f4d3c7124cffd965469a6a6dd12a3c94bcf21e22bb577e242
 DIST gnucap-2007-02-21-spice3f5-models.tar.gz 500311 RMD160 9818d6c9e9ab30a9b4aa03741144b2c0e12cd843 SHA1 32ce43e7550e266ff10f20c97469f8324b8ba561 SHA256 ca8bf250242828a3a9fef1cb48ca84753561539a94dc23f0c2d32333a36f5d07
 DIST gnucap-2007-02-21.tar.gz 1024218 RMD160 89c026b49728b2a54ee080ce3a5e58981f5c15c5 SHA1 c287839198d286e73b38f41b72e04eab2927822f SHA256 6e75616a892d64c531b6e97096b5327358ab77937a4aaee4de8c5a0a58353d4d
-EBUILD gnucap-0.35.20070221.ebuild 2009 RMD160 757731beee1b51cb869589d65440fe7da28e4009 SHA1 306e9c5f6638c072ed5b5c82ab172a6e9326f410 SHA256 5de2c4713e63c44bef66767b15e2357dfcf533b99a62c23d0732a8d80f479dfc
-MD5 71a0d8a59baa6978f5150bc7f4b9d357 gnucap-0.35.20070221.ebuild 2009
-RMD160 757731beee1b51cb869589d65440fe7da28e4009 gnucap-0.35.20070221.ebuild 2009
-SHA256 5de2c4713e63c44bef66767b15e2357dfcf533b99a62c23d0732a8d80f479dfc gnucap-0.35.20070221.ebuild 2009
+EBUILD gnucap-0.35.20070221.ebuild 2042 RMD160 3123ba3e79453e1cf9391a6bb20cf0aa8b174af6 SHA1 d3cd5658c5dfbff90190ee23ca167855b676c9c9 SHA256 05ff420cb21b6b144b6116653599c3956339f2eef8d8468ffb355bb9c506e027
+MD5 129544815c20152adc0bbca64cfe3115 gnucap-0.35.20070221.ebuild 2042
+RMD160 3123ba3e79453e1cf9391a6bb20cf0aa8b174af6 gnucap-0.35.20070221.ebuild 2042
+SHA256 05ff420cb21b6b144b6116653599c3956339f2eef8d8468ffb355bb9c506e027 gnucap-0.35.20070221.ebuild 2042
 EBUILD gnucap-0.35.ebuild 1044 RMD160 31e038b664782c205739a365289569e26f11862c SHA1 fc00470281c7aa95a797ceda783e31df984f8453 SHA256 9f0b34efd0f266f2687f070df89a2a82869d9695b987cd52ad425118795bf983
 MD5 ee82bafaf4e95b09ceb195f0eb84c9f2 gnucap-0.35.ebuild 1044
 RMD160 31e038b664782c205739a365289569e26f11862c gnucap-0.35.ebuild 1044
@@ -21,10 +21,10 @@ EBUILD gnucap-20060830.ebuild 1128 RMD160 ce3cb653d6657824a49d5270afd8837f37ca7f
 MD5 e0a9652c59a42a2938d4f002b46d459b gnucap-20060830.ebuild 1128
 RMD160 ce3cb653d6657824a49d5270afd8837f37ca7fe3 gnucap-20060830.ebuild 1128
 SHA256 b2bbd719157486d8cc2bae2b7e052f0226bf2e3452d078d3a85849b8b527ae0a gnucap-20060830.ebuild 1128
-MISC ChangeLog 5547 RMD160 f985f9537ccb455e1cf21ceaf6cdb05c048e048d SHA1 78f1e724f6c151469111439f71979ed490676f67 SHA256 e6d7b4552ad7ae2d6241fe95741d722462bea594424a9aaad9487ee6651b917d
-MD5 d406418d9c5b7c37addb3a087dd68fbb ChangeLog 5547
-RMD160 f985f9537ccb455e1cf21ceaf6cdb05c048e048d ChangeLog 5547
-SHA256 e6d7b4552ad7ae2d6241fe95741d722462bea594424a9aaad9487ee6651b917d ChangeLog 5547
+MISC ChangeLog 5682 RMD160 490cd2319f36ef6fdffea9b04ce43cd2be6f17d8 SHA1 4913f9d6d21f931d330ff81a0c42a5952514e83d SHA256 1e8b48cdbae202b0fc5772bf0c0bd49c0dd47375939fcacab13ba2fd0fff864e
+MD5 d195777e44965dc69156de7faf94e0e7 ChangeLog 5682
+RMD160 490cd2319f36ef6fdffea9b04ce43cd2be6f17d8 ChangeLog 5682
+SHA256 1e8b48cdbae202b0fc5772bf0c0bd49c0dd47375939fcacab13ba2fd0fff864e ChangeLog 5682
 MISC metadata.xml 639 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e SHA1 7c60875a5cf344f4c4ac272f1d49ecba5d813ae2 SHA256 ff13dbf0ea2bc18a97e2b456c50c0b57082e14e5bde50ebb04395d955e3d9076
 MD5 3da70d3ad23068a8a39c22cdce8999af metadata.xml 639
 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e metadata.xml 639
diff --git a/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild b/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild
index 9a56a162076c..05022aad6797 100644
--- a/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild,v 1.1 2007/02/27 12:31:28 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.20070221.ebuild,v 1.2 2007/02/27 13:27:38 blubb Exp $
+
+inherit multilib
 
 SNAPSHOTDATE="${P##*.}"
 SNAPSHOT_DATE="${SNAPSHOTDATE:0:4}-${SNAPSHOTDATE:4:2}-${SNAPSHOTDATE:6:2}"
@@ -15,7 +17,7 @@ HOMEPAGE="http://www.gnucap.org/"
 IUSE="doc examples"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="doc? ( virtual/tetex )"
 
@@ -64,7 +66,7 @@ src_install () {
 	insopts -m0755
 	cd ${S}/plugins
 	for PLUGIN_DIR in * ; do
-		insinto /usr/lib/gnucap/${PLUGIN_DIR}
+		insinto /usr/$(get_libdir)/gnucap/${PLUGIN_DIR}
 		cd ${S}/plugins/${PLUGIN_DIR}
 		for PLUGIN in */*.so ; do
 			newins ${PLUGIN} ${PLUGIN##*/}