Restore building clang-check and clang-format, bug #497620.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 34 insertions, 22 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index b2bab98f87ce..58778e261c59 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.170 2014/01/10 17:25:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.171 2014/01/10 17:29:43 mgorny Exp $
+
+  10 Jan 2014; Michał Górny <mgorny@gentoo.org> llvm-3.4.ebuild,
+  llvm-9999.ebuild:
+  Restore building clang-check and clang-format, bug #497620.
 
   10 Jan 2014; Michał Górny <mgorny@gentoo.org> llvm-3.4.ebuild:
   Re-add missing runtime gcc detection patch, bug #497704.
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 06db7cbbce56..4880fd6c4683 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -55,26 +55,26 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fc
 EBUILD llvm-3.3-r1.ebuild 12007 SHA256 343a88ba35b67f4d86c20e29e1f4919640a9c4fbf9942fb1733945480ba1e8f5 SHA512 3db9e2ad26e803ac663b696ff615eed83a4342e4b771f161b74304bb83c61f171e02f2b176cf62663724206a57e20be52ec22cf49de234f72b32673bb2588512 WHIRLPOOL 1c423485f6161b40daa5a7ebdc38838b4bd2d6a9c540881eb3cfbf5f592b454da32758ad23c2607fe7a875c65891f7b64f3079a53ac77af5b2decb6490a6b8b4
 EBUILD llvm-3.3-r3.ebuild 14232 SHA256 c93cc4b5d2f0b52fe3b61a024c192844cc7f5874ab0e620960d59aa16314dab6 SHA512 26ea2f5751cfd1c0acfffc910b3ff75fc8143acb8dc30f53e23e875d88a7e7e8a66af2eb9ec1df64e8d95615e973f84cf04a34a4deabc7121924d1837f27a2e1 WHIRLPOOL d784b48a07172fb1f8044b90ada8b24aee81655fec7fe7dc1f5e4ba1a69795f9cb522094de617712feefefecb242ab67afbeabce8e59bb27876ee91e890d2f2d
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
-EBUILD llvm-3.4.ebuild 14620 SHA256 e02df78dfbd7a9a287055e05f0475e1742604baeef1e58737899f3dd2f792048 SHA512 9d9743c3a6abe5d144baf1703d2b671179f28429ecf603dbfa168a76635ca268b707dd8a8e81a420a38f16083a2a96a1951a61ae66193d5298f709bcb08b28ac WHIRLPOOL 05450c353f41c341656475402c81b85c52570837cb35f6952965686268f965703afe7829cc6cc0ddf0e56bbad92c8fff7fc02d431c8edc8f3460fe4933e59abb
-EBUILD llvm-9999.ebuild 13756 SHA256 2e2aaeec0daa189ab13ffd9fd3044b26437b39884fc73fd37ae35027d0dc58bd SHA512 99cbd5c4686981d7c356be623ef9b8768910f5c816a6a0bdaad5e141d0f13ff1af71fc5e6d574d19c409663f9a4be1c9ecaa6bd222495623c6cbc0a50248b6ba WHIRLPOOL 3b130cd22af543f9d87c37bbe0f1c90e9731798047e3b652691e1767c85e71e3c589de5b68f62b22fb0c7af6fdb523bf0b57b23f1112cf761ab76be1a9aec269
-MISC ChangeLog 28513 SHA256 0e23dede058bbdc08af3b9935407d0976f4caa26ad9e7a15cbb5f13a3dd1880a SHA512 bfa02146dbd277fe37fe64b9ee08ee5a853f57ee1941ab0629ef9dc424788272085f4ae7b64f64c654ed344c43ec4b7aa4f283ce67ff86372069b90dee93481d WHIRLPOOL b64ae6e7aa2dfde7fa05c0ac3bd4a5851431fd42b4110edf40f5bdcba27c8bb32d50ae67b62f7c279aa0ad8b8d5e0fa0af4d5713cec961ae97bf7686105cd220
+EBUILD llvm-3.4.ebuild 14749 SHA256 02434d0432547fc53820b3127a145c359a6f149eee2956a9a8b2d7415a0df646 SHA512 76bb2592c82a1b9799d4337d3ed7b7e93eb454c89b5e548ad91b328585b57a32b4ec06730ca189a764f70a76c8a91c8306c862402e58da612fce3cf3308927c7 WHIRLPOOL 0d41764f462e83eaf2bc5d167477e2a5d63d4efcd2b9d6a00caa18f33d9193ab17cc35d1700bdc1e92a523f61bf3a150df3a0d509415ee1175eba54539013121
+EBUILD llvm-9999.ebuild 13885 SHA256 4b95091e31762220d999652ccecb9c90510989b43f162ab2b770b7c8a3e21052 SHA512 967c2dbd09e05b1cb1479b99b63b1b1e9d676abcfcbcfd4f8a20536f612d9696de0e03f1ac63a15b952a7e06a83428cba6195cc09eb79c0ea6ddb68cfba39633 WHIRLPOOL 5890ac706989c603c32cffa690734ac87ff79099bddf99a3244e11ff434bbe56e3880f1d8d475381a6e334520c6838f98e834a7ca482bf2e6a37af40fd64c7a9
+MISC ChangeLog 28663 SHA256 394ad6f313fae867337df77209f6d7beb8080af0aab766a7fe58178ff781bf23 SHA512 b807a9f0a6461f4900aa8aae3111c78da2982b1fb6aa8a81ab629d695d92b699b07606912486fbefc8417d72347060a40d8a893dd9dcb6eab90c68b11545505e WHIRLPOOL 201f975dfe60ba3bb01731d565a86afdec8415ddd7473036f61ce638e460bdf79911ad211ef72f6ef2658ff7aea59ee1dd85bfd37958c94c2ae50cd656ceeb41
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJS0Cz2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJS0C4LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxsUP/R3JsmtaFfWtSkThqq9XVKPI
-ybPTbk+weEbyl7+e9qIFGu7P32VKcfRzRPBSeBnx96VS8tHcjh5KF3fC1fJOQ1IP
-dPIIEF2M3IHI52o13ikPDfElUGATT2PBQR+x/aUL3Op6ALhrWa+mb9jI5E/wXEQ0
-YWP2qqopcybqFQHRWCe0RCQ2Xl8p+G4826AE9WaW46ebW/38cAdg7zhwdAv/qrvI
-browIRHb5Wpu05604KXn7/2wpYtFm4qQY3zuq9apl4RlX9diAJZYkCSUIixGdRWE
-Ih2G29QFydRCmd6Yp4lNY8M72Dd+Zn/yOk/ieCdAp8oGu5JEEJ5JkPbMh+jiIj+i
-7A9HjPTvDyugfD+acpJpLZjnYkwHQkK9UriJydzIpngZCGmEGRrVUxpaJulkP/0R
-jyvqW6ZnWbC0IS9ypoObE+lAZJueHJns2mAsCdJWMnDryxb9+xaORxOAU1jA6K9a
-0V8raRIYQMdlcP4E7euGm95UYsvRpMT1iNWWW28QSkrnRcXkblu5ht2X0oShT6P0
-pMHbKK1ZO0RyL5FyFMyKRyoWK1t2CAoAkPnuPze9mFBRw0mNJZsIAH32xIcZ5GFY
-sEbl4nFmH1HTAlM+M62z3aGp2wZHBW5CLS0ec2JpOopgAujpvdnM6nVX/cJo8oGd
-0ZLlW1cpWEqOucWY5w6t
-=JV3f
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlo4P/2aS9NvXxtqWQUPDwiMjjeMd
+D9feq+Yx+2FI5FmEGkhYCiMa1jMqclIBotgukfOU6WYvFbKwUinAKUI0LnKHIr0S
+dWsw1ruYjPa1xbsrUxGAj0GZnFGNnebcB/hgmZ/K6p3Uk04/nP3M0izdcC8xCHQo
+toqpxHU0n8SdmTV3diNd46wpfyBzJ1pHE/UHxDkz5LNELQrlGBvZgU8hwwvgFwK2
+o//WvLEOi0gmwqRfakCbs9VdwE5ZC1TixB26G7m1T5L0W71o65TckGi7X6NdL+SE
+wq8ZGc8Lencvp1ZDfed4oWUCG8J9Vh34ZEQTB3Uz73jIZXITPEnRSqZWNZ2lRELS
+E5XiG3jlHliPTu2KisAXDwE5uJi6LfHvPu57PB0fSpWqs6Qx7Oi+jH9y4x/SaPv+
+Jl36ZGOIhaQoH0FRvY3qZez+wlcXCUc0dJduelhLzDEzvbaL8qZbIbjrdFn04uP7
+3A2+J6qq4p+GI9UPWR0soqy8mdSsSw4TXnYcThrUivtJ6HUf2DViG3qRCIDk3y3j
+RMza1Ypgg+0TkL8e/Iuy16TsCowmn7BHgGmJY6w8K2Z+03ExW//Mj/s6PMFZMVdm
+82lyrngD4uJ0MaXDBmolBDhU947O0l5geIlKKQGGSYPfuuMS8UNj431WKSYctN6c
+p5KjF58tejbkBGwkKAGe
+=l2l3
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.4.ebuild b/sys-devel/llvm/llvm-3.4.ebuild
index fe6c64b8bfef..32b312169010 100644
--- a/sys-devel/llvm/llvm-3.4.ebuild
+++ b/sys-devel/llvm/llvm-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.4 2014/01/10 17:25:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.5 2014/01/10 17:29:43 mgorny Exp $
 
 EAPI=5
 
@@ -306,7 +306,11 @@ set_makeargs() {
 				use gold && tools+=( gold )
 
 				# those require clang :)
-				use clang && tools+=( clang/tools/extra )
+				# we need to explicitly specify all its tools
+				# since we're passing BUILD_CLANG_ONLY
+				use clang && tools+=(
+					clang/tools/{clang-check,clang-format,extra}
+				)
 			fi
 		fi
 
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 93196bb28f76..99eb36acfe8f 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.76 2014/01/08 21:42:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.77 2014/01/10 17:29:43 mgorny Exp $
 
 EAPI=5
 
@@ -298,7 +298,11 @@ set_makeargs() {
 				use gold && tools+=( gold )
 
 				# those require clang :)
-				use clang && tools+=( clang/tools/extra )
+				# we need to explicitly specify all its tools
+				# since we're passing BUILD_CLANG_ONLY
+				use clang && tools+=(
+					clang/tools/{clang-check,clang-format,extra}
+				)
 			fi
 		fi