Clean multilib_src_install_all() up.

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

3 files changed, 35 insertions, 31 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index e1e3906a7990..d8a43e23608f 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.249 2015/06/13 12:10:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.250 2015/06/13 20:51:45 mgorny Exp $
+
+  13 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Clean multilib_src_install_all() up.
 
   13 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Simplify doc CMake code
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index e047306af19c..32dece4f49bb 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -99,25 +99,25 @@ EBUILD llvm-3.5.1.ebuild 15323 SHA256 3b673170e10b2cbad34d877eeaa870f7d26d777b85
 EBUILD llvm-3.5.2.ebuild 15351 SHA256 d06513e37ce4a492610840c9788aaeaf86fc184ca7ba6d7f9d897a5a1fc3aa03 SHA512 874c560af1c62c54401bcae868973b47576115951e353c1f324b88465ec8b19e1f549c8e8927bae6f3fd65a458f76d5903afd385de059724998a881e18b06d84 WHIRLPOOL a2fe4a0bef21d1be6e9a0e77e364c60af28ec5cff6f5429b40d1b821e462ca36a8a099cc7230e195253b77bc1871bd523f4f3e70cffa17ea3c318766fbf7879a
 EBUILD llvm-3.6.0.ebuild 15310 SHA256 213f00e1aeb57bed52823f43025c63a820a0aa92421de7ec2d539d61bb212577 SHA512 13be6ca07c5c90dd28656261b4585aa3810ab86024949d5865892bbd58508d9f77eab390aa5a5288c84aa3e2ce8d0ed5aeb9b2b84f28a77fb22b1dc5abf24d44 WHIRLPOOL 0b3f9778f8d3ca8417e7943ad49c236446de927ddcb80bd5b5fb62fc6accd63663666db716104dd6eb27552f288999a7191842b6fc0c4ccb9d810152b78f4659
 EBUILD llvm-3.6.1.ebuild 15458 SHA256 2171ecd5da2735212e4539a43211db11d5f0126cf47b4bfb38dc9d4cb4370391 SHA512 631e497f91049fab1cd9f5d835e73ef744d76f84be4485ae8950d63a0c6d5a04df9f9e518b1c566e9d3bfd9a45e1d791ac64a1d35f6d72e0c4dc2b34b496fd56 WHIRLPOOL 81b5d30b99e3b59ad0ee386e700311f72a06490227890f1816c4af733566bd7c0bbbdb671b6cd73d614ca36e5c3b3c5fc314b89d695654be6f05fe3113172660
-EBUILD llvm-9999.ebuild 12674 SHA256 81a6f2e7f511eaa7fd445980c386649a68f63ca88737ae3b8c754fa32c87b112 SHA512 47230b3977340d02c7e691ac7e11de1ebf1b71f93908523ca9f2286bf3e31576915c9ec75b3b211c5cf8d9d7418a931480bc387ebfb579829bc004d6b27b89e8 WHIRLPOOL 10b8c4b1b1aba691721d53c2656a141d00037601ecf2ae80040e2062567ddf0fa6d880adb11e798362800af0143cf674aa575985f65301568ad317b734ed64ac
-MISC ChangeLog 42238 SHA256 ecc931d168e046df4a6404fdb6f048e482a81193a7e6ad98c2c4325bc8e8b425 SHA512 9b105cb33968445ae85140d880fbf36460fbf2ce7f60d069746eb0600333b448c3fcd95a924badb42f7cb82ac567ee7490c571ec32959612db7c39d91cde6faf WHIRLPOOL 9b298877317b30ccc2b9c7d45ad089de74df1a523737206679914e455952f9a5a56e715d93b0abf120d04deea0a5596419f7cfa76591d4d0cf5b1e65d5cf8fb9
+EBUILD llvm-9999.ebuild 12570 SHA256 15ccc3fbfa05a19bb970cee935ec723d5e0510718cfff0b530c43a378c7de291 SHA512 b1ea1b63209c93baa57eb123844010fc18e4e32edaaf62cec8654c3627bbe53d22308e329b3d2d195b2e2e7fbc2dbc5dcdcfa49a23f7eb4a6f8695f42c6effc7 WHIRLPOOL 4e11d0598ad531ca5a2e646fc2441af137d5621471f5b137f12acbd546e37a6b25430061c0f9a232d815f3713fc61956ec8a6c66968b29328e7a13e6db15a4d9
+MISC ChangeLog 42346 SHA256 39b4b778b3891f06838a15f60e70cf446855a85e7e8407b9961f7831e8310c31 SHA512 0f69ba9fcb80d06cdcab2ccf90aa9f8a4788be9a153af252f3aff87122b086a8583ecf58efd7883d8eb56e2048bc978f0e270bcb91f17a5a8a52b0a245e20b17 WHIRLPOOL b9ee7d8f53e3b41c7e57fd50ec8dcd9989769112852e553b35f7d7c73721c7f1ee5e4f82333365ff8d02f399eb34a54418f6e210860f1f9990987eb284a2b865
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVfB3OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfJfkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHD0QAJJZjkN017UL8noA6tlzmaIk
-Xwnkgmoiut0Q7TPKX+BOD44dzdbuALD1ebUfMe8KSCMNjIxpvKex5T9kF4yeaprY
-zC8KvF57czAmeqQj9HAN2/Hy7aULKhgs3H5J/fBwuXQ8WP6Zv2J/W4M+BfiHBGoa
-fM7/s10AzBrc68283sw01ICLthrQ3RRmUuT7KH7OypkW1cajnjniNU0wn9NdRJat
-QIjirOUpJau0O7lqIOBaBYsxcD5dORMB5dNZQZXAsWhHE1XRM7/Azn7eYJAEQr99
-wWhagt+ro3dWZFUt/MQXTkuzcWHUuBcyIgX38ycoGjDmNRQ/1xr5/4iJ7XeJN9w1
-+eAAcKMcLmYVNMAPEWB/j3orWieHnREudFAUlOuZ4NY8+YX6N9MVaxGDC+4hh1ez
-Q0CBjI2E04jvR3uyFf7t5Pq3Baa6zDI1WTalPsTOlkYmHGr2moc0FLWP/0VKkfVI
-1LJvROtf/+MBatE7SpDw8iElWEOlsfVsN+8gR7jhHA2cBdZoJ+zkMIMMuKSM6iAa
-Z0bb2mBBiBOTCT3+L/v+OFqj8TWld1DrTyEfNKKZjZCGenKqa8Rg1MO8R69c4Bpf
-8iRK7hx3y308EmtN3b0YUPgs5Jz/uqT3T8h5H/fO6bA9+hwCIS6pxXJPJk1SsTij
-WQ5IXnn+xssbbhL/WF+w
-=jF+j
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOE84QAIt1yNGNm1cbHwJainLS9wK0
+vkHxfHB4UXkzLuqgOfOHkF5C1aefInSZlPn6Fj39PnDycV7zAi9T04KfLcrLrQ7b
+3TyruX/R23Vm/G08eYX8RtjhQi9d9Y/6gGVOudbl0WH2YRAAcyO6ju4BUvm3xhoK
++f5PiXOwfd+dOpUgKLyJqVOfE8akS5YlBVFmvlDOdOHPkwDjsvL9TOH0QH8QA2Ug
+c1nLLZZNK/UfAxEporrEd/4L47NQv9V+Gxa7wtzYQ5E3FptZBcaa77JztXLkL9B/
+c7JBqErHwE3TVxGX3NSfmN/7zsqXyvEYgnCxdtm+30EopOtFMU/w+998nGDEEDl3
+Gx5KwS0Y+ytjZz4WXwOQt/WApy72mpyJVUKb7upFp4lIFNMFBqBX2/7epD7czxHf
+CEvZSEJVt+zlBgilsussLYvXsZy9kQ/YwddlvPtNr/rcjbsHH9Un3/9wiGvxDKNd
+lh7ymn5dPMBAWz+gjlwWCRKst2p6pT/0Z3mK2l8hgakNlyTddVHF6LkdcLsmZJyc
+ovIICeKxKoZjRdZAzmN0lQe95InZ2iJGiul0F240lxE/2FG0UARodOezHuI5nM0y
+jVUsn9g8SN2RkBDCNeqKaJIk88Yes8K/tb0ZGmvSKlY8aZuchClmMRRBdOc/DW9u
+3Fjhbm3nIy/Vw6DldCjP
+=LjLl
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index ef7446674c2b..b98537eda435 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.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/sys-devel/llvm/llvm-9999.ebuild,v 1.115 2015/06/13 12:10:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.116 2015/06/13 20:51:45 mgorny Exp $
 
 EAPI=5
 
@@ -397,24 +397,25 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	pushd utils/vim >/dev/null || die
-	for dir in */; do
-		insinto /usr/share/vim/vimfiles/${dir}
-		doins ${dir}/*.vim
-	done
-	popd >/dev/null || die
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	dodoc utils/vim/vimrc
 
 	if use clang; then
 		pushd tools/clang >/dev/null || die
 
 		if use static-analyzer ; then
-			dobin tools/scan-build/ccc-analyzer
+			pushd tools/scan-build >/dev/null || die
+
+			dobin ccc-analyzer scan-build
 			dosym ccc-analyzer /usr/bin/c++-analyzer
-			dobin tools/scan-build/scan-build
+			doman scan-build.1
+
+			insinto /usr/share/llvm
+			doins scanview.css sorttable.js
 
-			insinto /usr/share/${PN}
-			doins tools/scan-build/scanview.css
-			doins tools/scan-build/sorttable.js
+			popd >/dev/null || die
 		fi
 
 		python_inst() {
@@ -425,7 +426,7 @@ multilib_src_install_all() {
 
 				touch __init__.py || die
 				python_moduleinto clang
-				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
+				python_domodule *.py Resources
 
 				popd >/dev/null || die
 			fi
@@ -434,7 +435,7 @@ multilib_src_install_all() {
 				pushd bindings/python/clang >/dev/null || die
 
 				python_moduleinto clang
-				python_domodule __init__.py cindex.py enumerations.py
+				python_domodule *.py
 
 				popd >/dev/null || die
 			fi