Add multilib flags. Make the deps weaker (no need to enforce disabling everything in LLVM).

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 32 insertions, 11 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 1c019ab85caf..21229267726c 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.93 2013/07/31 21:51:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.94 2013/08/10 22:35:01 mgorny Exp $
+
+  10 Aug 2013; Michał Górny <mgorny@gentoo.org> clang-3.3-r100.ebuild,
+  clang-9999-r100.ebuild:
+  Add multilib flags. Make the deps weaker (no need to enforce disabling
+  everything in LLVM).
 
   31 Jul 2013; Alexis Ballier <aballier@gentoo.org> clang-3.3-r100.ebuild:
   remove ppc keywords that were added by mistake
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 907c6b9ca586..d0845680ed14 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -41,16 +41,28 @@ EBUILD clang-2.9-r1.ebuild 6438 SHA256 00d9147d62dc19548c841243fccb3b81aa5abb32b
 EBUILD clang-3.0-r4.ebuild 7166 SHA256 50fe174e45d88d5f1b31119600ae9c8f06f27b14b497d8eee4a1c805bcba92f3 SHA512 834247ed9475353da30946eeabd206a6164eddff8195b5a717fa1bf0e1760d910ee7e0943fe805f3c259a811c0f4514e5bb5aa272a049a195e9f12f68b554669 WHIRLPOOL a8432fb8a00f29a0cd7126f0d028866c893f07d2d92122d09d952caf1c62fdbb0eaa18faa230ecab4bea556252085db152e8c0a3ed6d3cd1adcf3d987cfb9a67
 EBUILD clang-3.1-r5.ebuild 6696 SHA256 4a4d884d8c37044fe7dc5f325e88f4733140997b3d2de64c0d6e35d9604c477f SHA512 2ba6057e08c8533fbaa45810f4d9588b57b20b08c9b99b8a53ed32b95d17a43ce13f15d81618e4cb3bc6cb4ded3c50fbba2a866a0d130a69a107195c90dc58ea WHIRLPOOL 890f64a0309c731e7784f5196ac3da602e204c65566412a398a8f9bd862d1b1e5337eae56fd309c1ffb9fc750741982481abcc13567973017df650c6e5dd1be8
 EBUILD clang-3.2.ebuild 6519 SHA256 35e962bcd5fea3f406e4b684aaa74bb1be4bdfcda63d963a9bbab604a858fe50 SHA512 20afd7ecc1af578ac3e1d9b6694c3d82d6d6591153496c5a1a07eeb4189f1e3be54d8b18006239ced612bd9d94912bdbc34706599383beff46fe4aca9ed93952 WHIRLPOOL 1fbef46523a62b049375445b4749d42ec93ddae4966a1dcf818b2e1e1e770a8cc67c00ed849fdb291ad29100a5f8b66236a6317b7ecf9bdab02826396be2d18e
-EBUILD clang-3.3-r100.ebuild 780 SHA256 1009fe9fcef050d34057b790d0cc8d06d0b91e3ed5a283f2a27a09aff6147089 SHA512 1df822ae8986a4397e80071b83542110e2716df2fc3c26a790fb85d81cbd18559aad97efe007e2f16c0fb04ceb9e3d8d7fe7e735746fefed220e84ff99e35099 WHIRLPOOL 30b75938602849e335246a7dcd8d53dc2b44262bd524bdd6be95fe465edd949bfa3309dc21c7259b9c18046bd787abedd7548656ade1724f96fab80cd5147ad7
+EBUILD clang-3.3-r100.ebuild 818 SHA256 a30d20b58807f30d561084ad8cefb6795f44783a955cf83e78a41471eda59311 SHA512 5ba41f3c5f638f0150b6b30057e432d9890f98658d0aa6a1659115ce77ce26b0efb0f640618a5c17019a4476b62b0248a0028d58f63781e1bb290bf46d1e5bab WHIRLPOOL 9453bcec1d3505f60f5d74b4c39c3f1c6930b138b5298bfe25622a9702cf15600ed92eacb9b60c593109b2afff3750294b0b608da2dd39cc9f32944f8e3f807f
 EBUILD clang-3.3.ebuild 6916 SHA256 5bbaf90c57e9e10d2c325feec28466366fe1e8bac214f4e5d0291f6b7a1b534a SHA512 c4f2d747f07dc9c0b8b7366554c0fd51cede1eb8327b8529c534c3003f005efecdeacee7acb49521fc2fad3a90f62aa41b67fc1e51951fac52a3debe3f655da7 WHIRLPOOL e3ce031b19658760fa5ef0456ce356a1941dd8a98112e7aa0948aaa73ff3cb925607f689579f5c87bee961ab199f84e772638ea5a523500f60951509864d3478
-EBUILD clang-9999-r100.ebuild 671 SHA256 614ce0bc10e228fc530db9d4818892c841a4a55b4723543844cc2c47f911e302 SHA512 548d7eeb049c842da9b93dd2e1cdbe4d584f3a5785b622649601a7a8a6388cc126523ea74b05d6ec8ed7a4b6ace2c4eba7aed742d3d3a5c8b83ef848db5bf4f5 WHIRLPOOL 1afb30496ac330ebf3c03e7a91ed049dabb55f6ee70b5ee59c6332e7de2daa599b8cc8f6af2a2c1e1331b83cfa1c45c8c43ce8a3cdb3f99827e8622b2ca589f6
+EBUILD clang-9999-r100.ebuild 711 SHA256 3dba0be9d0affe7556a63b8e9d3184ec087960e4a5f8f613e2a2f744c38937d7 SHA512 61923205b05b0ed9b10c679e5680d34009c9631dcfe8c689b267218d38fda97d4bf8115e77b288ff94794428663c58c1f48855e104be295fff0c3f07ebaecfd3 WHIRLPOOL e1032c27eba08c65030a236faf8bcccec0d5846549ac2a31f1d7bfd763a2b70506723a4c9f897e6b60aecc58638537766079b7f8fe59b06623ff2425505b9f01
 EBUILD clang-9999.ebuild 5989 SHA256 a36d63cbefd5e7d6db8f39acdfed9754156810efc912626a221e2d1d3533992e SHA512 091f36174231f6a9d0a913cf9a0232829d55aa824319d78ec3370e6fbfce805bc76769cdc02dcdc54f2d5895f14da4a8c6ee7592d208556d38e501dc7822b660 WHIRLPOOL d16bc8d75c7cb53274bdc261ba415db56b69b4fc7c46feaca470060a2b7af8fb4abfa4a024d528a33f853611f1c165731afe0e36f435d088165348047113f4ff
-MISC ChangeLog 18359 SHA256 81fce367a8d1d47224f3bb77150112a00f7cb003a4bc03b7ca2e7f193b969e21 SHA512 e16d209fb3d6250d6e8660e8142d9af024254e0d9c7934a142b02605da9c0c8fad3292a86b53e10734179ad622434864256a19a85ca1695ae8d3d54f11a570d3 WHIRLPOOL 792f0b76fba63c4812f5b93ca983ae680e9843ce2df8aa554c42af2039a7c418a492df3261922043c63b2d886a3e24ba7db88edabaf73423b4aa1f2466c53f71
+MISC ChangeLog 18553 SHA256 b5d4b4c10ff87294edae8271d760b3dc08ca17bdcd09f52590d0b68616b6c47e SHA512 3cf54450b9a73fae1f357839fd5452f752fbf857580d8c25e21f51531386a0ac550ee4dc3e591834af948c2c379a689dfe2f31da03d2e1ade01ea1ee6df0ded3 WHIRLPOOL 4ed1bd9be7d56d18a6963024e36ed6c5db8263e363e45470f565d573fe2f7e95d97a7034b514a0f7c908a3a1e33ea81a1407cbb6e8091f3a732d183b9cb10244
 MISC metadata.xml 1522 SHA256 c0c8a45b9d836fac31adc4d76a2de92abf2c8d603b69146fc72e6c2484331f42 SHA512 b8780e7a635fa8c32c6cf73c842982d85a11f24daf8049bb3efb165808635875a2331072c01865df230b1dcac7135fcdf9fa7ea19ac46a35ac9f50ffaf4c5067 WHIRLPOOL 2bc088ce4d44c7d0d2673449116052d70ed7298afc14bc5cc460d5c60dda2c1df65a3cf89e8cd79e52e96414b2eb759dd95ed97055cfd41822a4b9f540fb662c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH5hvQACgkQvFcC4BYPU0q+eACfZGc6ZGCI5jIEDNnzYCEyvPf2
-BKMAoIMdFIbx23GTYAvCpkE1Plmm5EEB
-=T9cd
+iQJ8BAEBCABmBQJSBsAXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDlKkQAKJ4znv3t2FxX+uXReq0obfd
+R0sHbI47muJ9ECj1UqCra170RVdZH4ZAZsg2KfLRXyFfMJjZwAlgzbMdGwZCH/5i
+uQuPiSrj6Gok+xmaphSdasE1wPJG48tzMc5L7iqbFf59zjBnaJFpeE8FWc7tJ5RN
+6UDwowKj7SqzM24cqO5lf22Lk/6DDhAlnfoQ1gYkN1PNPIqf8kZwtuH9s6wEVWVa
+gmj+U3/AVrfryz1tkWUH2K6tGM3odQnIfiN7K8adqmAfkBqzy6mlFw/ycH1PUBv5
+y9qkWigaG0U5nJ4LJGQlKURvtkspgF2bxdKish4xGjyCIMvVTyA/s3RmmrgaCok4
+P2Fq3hoWaiVDTVIIuiEhZRaifCJix8mskJfgVrepm6SBeW2eJgXzUfOIqOd2jct9
+15SCNvPOjSa6qJyAfEtj5JyyvgRUWLzW87UG+VTzeMsBOBcmT26KiV8trgyJVcgB
+/tyxOaVg5ajBM6QAhCjYW/rPJaa58g0lMwbZ5u5XURFR4FuBikrqWmLkKN/GSy7I
+s0mehZn9kGpSVLP3PddtE9EGuztpieufNYGiC+wKJTl2MbrD05W6Zk3Tis3u0VHg
+IxoC16ZsnxT9KTeXPToqJWUUjwtB+QjXfXiYchfSlocJiH4d3+Y2uan8le6zuiXp
++qjljvKD+/eI10VYMoO+
+=TIQV
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-3.3-r100.ebuild b/sys-devel/clang/clang-3.3-r100.ebuild
index af912a090125..8b44c1fa3ad4 100644
--- a/sys-devel/clang/clang-3.3-r100.ebuild
+++ b/sys-devel/clang/clang-3.3-r100.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3-r100.ebuild,v 1.2 2013/07/31 21:51:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3-r100.ebuild,v 1.3 2013/08/10 22:35:01 mgorny Exp $
 
 EAPI=5
 
+inherit multilib-build
+
 DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
 HOMEPAGE="http://clang.llvm.org/"
 SRC_URI=""
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug multitarget python +static-analyzer"
 
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget=,python=,static-analyzer=]"
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget,python,static-analyzer,${MULTILIB_USEDEP}]"
 
 # Please keep this package around since it's quite likely that we'll
 # return to separate LLVM & clang ebuilds when the cmake build system
diff --git a/sys-devel/clang/clang-9999-r100.ebuild b/sys-devel/clang/clang-9999-r100.ebuild
index a1918dec2100..619bfba9c620 100644
--- a/sys-devel/clang/clang-9999-r100.ebuild
+++ b/sys-devel/clang/clang-9999-r100.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999-r100.ebuild,v 1.1 2013/07/21 10:03:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999-r100.ebuild,v 1.2 2013/08/10 22:35:01 mgorny Exp $
 
 EAPI=5
 
+inherit multilib-build
+
 DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
 HOMEPAGE="http://clang.llvm.org/"
 SRC_URI=""
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug multitarget python +static-analyzer"
 
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget=,python=,static-analyzer=]"
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget,python,static-analyzer,${MULTILIB_USEDEP}]"
 
 # Please keep this package around since it's quite likely that we'll
 # return to separate LLVM & clang ebuilds when the cmake build system