Fix for non-multilib on prefix

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 37 insertions, 80 deletions

diff --git a/sci-chemistry/cara-bin/ChangeLog b/sci-chemistry/cara-bin/ChangeLog
index 66c62d3f1da7..5ced8147bd5e 100644
--- a/sci-chemistry/cara-bin/ChangeLog
+++ b/sci-chemistry/cara-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/cara-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.12 2015/06/14 18:56:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.13 2015/07/31 10:18:19 jlec Exp $
+
+  31 Jul 2015; Justin Lecher <jlec@gentoo.org> -cara-bin-1.8.4.ebuild,
+  cara-bin-1.8.4-r1.ebuild:
+  Fix for non-multilib on prefix
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> cara-bin-1.8.4.ebuild,
   cara-bin-1.8.4-r1.ebuild:
diff --git a/sci-chemistry/cara-bin/Manifest b/sci-chemistry/cara-bin/Manifest
index f8637b4b9762..424657b2a6a2 100644
--- a/sci-chemistry/cara-bin/Manifest
+++ b/sci-chemistry/cara-bin/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST Start1.2.cara.xz 43124 SHA256 c28321b051902bc020ea04a46b33ceb19b1b3d902264956474c90798f2d60d25 SHA512 26874d634491558dc593a0ec32e83d5cfceedc69bbf901f4d25d6b9515b84aebffbf495d1ac34b3664b8b5822954edf62c5b88dcca6bcfcb152715caa88f5f03 WHIRLPOOL 034e8b73354e7244e4fcc21c03da7b99c02019ebef1e0754dd9cb8249fe68b82be1e78db9848912fc48c8625b0f2acf0f41242d83949a117f0b8a648a930445e
 DIST cara_1.8.4_linux.gz 6677463 SHA256 5ba34cc8b0782e1791186cde5a02ec036665769df7f5c559db27377b6f3cc6d6 SHA512 e264cfbef640f267132dfd48b940203a319c8f34de71c5b786c6bfc2ab561bdf3fbd79516d619ca52b2aca64a2887f770fabfabedb76433c5f78aa02c65f898f WHIRLPOOL 5619c70bc31dfb328a72233c8fc3e3d8dcfdccc3db4e5a67430f0ebe8a0a474f998abb2a0ec56f4a3c2e6e4b95e324ec3c667864c81cb3531a1e162439c780da
-EBUILD cara-bin-1.8.4-r1.ebuild 1276 SHA256 31f7e84a44febaebce14c60870f1f295198c121e89b73014e515a9fbae5c58c7 SHA512 b219b36e7e7eb6f6539a4929e52f85138c0fb3700ca4051cb19bdf36dc9e6760883a1d7afe214dbdd08accbcf5e93a5a595e16683d2a40e08db85fa1e63d6e40 WHIRLPOOL c8f4f8224b59d29aa09a07ecee5e325f78f7c5c34b0b557525d82ace63077dccdd86d526bd9d99bb9c2a407e5e0e0cb114bc543038021b99e843afb0dfbd0251
-EBUILD cara-bin-1.8.4.ebuild 1353 SHA256 7f0eb22c374e19080d134849fd9bcd1ec6f156208cca9002a890975e20400fa0 SHA512 fd2a6ff2a62cc7b8ed346e6b84cd40326625da5bb7d47731ad0d3fae2b2bd1779222cc5d054a11b3db5ca8207fbdfabf4da0b97244beabe9e706b3f8f9463e2d WHIRLPOOL 1fa588f6596b84fa37c134fc019d9801de0a24cba6101db5d4b5d64395594b2a33b82af35bc91fda5f20cf779d76abc421edd352f25c4b51a936e72522379f79
-MISC ChangeLog 1724 SHA256 6cb66cb0cf4905142353ccafde3e0a5d87fdfa18592b909bf06f814121d059ba SHA512 036590aaa51c6954b36d058fc0874a023557298741f21540ac88c16b10a304097f271e2c21d2edffb55de0dd1d022ffe1e567513e42e2da6e89d06cce0bb2276 WHIRLPOOL f51c4999906ab6f994829c06fda525b56807e59c515ceb0df367a378e88f1152b0f7a3340f10ed0a1a8605acff05f7294d82d7a7b667a232e300a39145e86fa0
+EBUILD cara-bin-1.8.4-r1.ebuild 1302 SHA256 a2d67e52960120172f2c0b588dd89ef02c2ef14f7586673b6d1e01a2bb11a1ff SHA512 504a41073fb92a8291e57ce83fd4de1798ededb40fd04ac819247c59da800fbba55ea2b6daf4e59910b9f96910990632a52ab4f788653ed2f4da2fbc04b62f30 WHIRLPOOL 0ad965e8ca976a4f66a8ebcfa9ca0f9d9c5b3938fd4e10c44b967f578dde9a44a0e713e17b2d522fc49a6fb6f14e1eb2b981353ef3054d67e86ede2b8aecbac3
+MISC ChangeLog 1858 SHA256 bd5f777f204b61c4ca0002101cdb2228ca4dfd1c2a9c3479601bbef5b38690f4 SHA512 b97f6a4be36f201e4336193038608f8b41eea50ef76c05383de5affee66d568c7ace9f8251ebaecbf3b334843b5c00df4a76c5de48bbc6dd409f380963f2170e WHIRLPOOL 06ac3d523a6c37ff99b37d16aa2c9f0876c1644d22e0b74d879299a010cba1e38adf270ff4c93bc8dc5ce948984d93defb3a1e0bb9c5e55b50520994bf140fd2
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQGcBAEBCAAGBQJVfc3jAAoJEJQzkH1pP7W4CYYMAI3YnSKRmIzWI4K49hksyao6
-kJVPHSxnVBHxPGZpvdAsqnk3xxLjo/XEIqy6B+qcX0JKaD3NS6CY7Cz9foy1itma
-0qo0V4pJvBTnUUNSQNX1oAA9YnGDG8S4F+T4Yivwo5UQ47FxwOBl2qcj84LP40zF
-qc1pycPBOxt2A18q+X7WkxYUYjCc+51EmOErIEA6UoCNhWHeACahi2+kudiHT6kj
-OwHODJtrnN1IzmMs2MS1K+cqP2bJjvmky6G6FVpGp9KpTuR+e3bYSwrmdTei99mb
-78SYfgHBB4r+TnX9c9sS1lubbjVOiFVqfkMdY1jpyFDcvUi541Dm0XFjLZYG+xVp
-UaRuzX3gVTriB4dXvnTZ5Xyan92oopnEkmr9DcRfDOymdMlRXVrNEnvzacaWXHEi
-j42++rJklB3ETl7eMhCE8ZSS/WwNdDlwY8sjn7mIC97A8N3NfDRQvwWy8+anc53Q
-4qh/0QlmGD/qOXcmmP7ieJOdau5zHxmEb9W+/x8OCA==
-=+YPT
+iQJ8BAEBCgBmBQJVu0tsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLQsP/iWloihfzZ9qcY5rABvo2dWa
+FDu1TMjBxK89/piN3wD205zLG5zaVa99hCd7nz5jDpTnr8iEWgv+XWOQ1URqTRG3
+UvM8UNMcf2scFDfGpn0ipu/PmiOZNm93ocXhmifbAziqRp+VQwK603NJRhpJVaBT
+yzBjemdFLWrodyM2iLKoXEyL3oswcQht3L5xmmFHJrTyTeTCasd6B60whjtur+8c
+5xOyMFEy7E6zyuBdk5lnF8+cNuuAnrYw24enMHq+Pxr+vhcfmRPpMXm+Mf1NTAsU
+VWXV6eGdAaj6pLX2boqmgHobApXrahJc2VpGQ0hHIbw3cwNrGzAxAjLruYdd25Yw
++A9krQKY31KGCjjpwcInRoPId9MHOajYyhk+hdIAt/Z1MykfaTJvvAiJ3+oKxQHQ
+g+Ja2vdOwZ4p1OmRVr5cu312v8J2Rpv+zSUQUZZfauXQLPBMFxkOlUHYqYgrO+7R
+4z1glBwjN6jLxZZQVRLUOzClKWLkov0Euv0ey2oiGp/BPjC5srK3M7kLg52uoI/y
+J+l+otRvR9XBhcDfgep9uz/NnpvtuCg+wjhMl2pMdRkBUswcSzLpExl5pBeeTizj
+idOHl8888+zjMROx0cuuDJNHp8fE/foCFveFNBi7K4SsIueEJdy1+lorlHugEiCX
+NDQLuHGsOK2CyU1ROC5J
+=gBS7
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
index 96c12c9fb5e3..aca0481e96fa 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.3 2015/06/14 18:56:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.4 2015/07/31 10:18:19 jlec Exp $
 
 EAPI=5
 
@@ -19,16 +19,18 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	!prefix? (
+		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+		>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	)
 	virtual/libstdc++
 	lua? ( dev-lang/lua )"
 DEPEND=""
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
deleted file mode 100644
index 0c17b30f2fcc..000000000000
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.10 2015/06/14 18:56:26 ulm Exp $
-
-EAPI=5
-
-MY_PN="${PN%%-bin}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Analysis of NMR spectra and Computer Aided Resonance Assignment"
-SRC_URI="
-	http://www.cara.nmr-software.org/downloads/${MY_P}_linux.gz
-	http://dev.gentoo.org/~jlec/distfiles//Start1.2.cara.xz"
-HOMEPAGE="http://www.nmr.ch"
-
-LICENSE="CARA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-	virtual/libstdc++
-	lua? ( dev-lang/lua )"
-DEPEND=""
-
-RESTRICT="mirror"
-
-QA_PREBUILT="opt/cara/*"
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /opt/cara
-	doexe ${MY_P}_linux
-	dosym ${MY_P}_linux /opt/cara/cara
-	dodoc Start1.2.cara
-
-	cat >>"${T}"/20cara<<- EOF
-	PATH="${EPREFIX}/opt/cara/"
-	EOF
-
-	doenvd "${T}"/20cara
-}