Update sys-devel/llvm-3.5.2, sys-devel/llvm-3.7.1-r3, sys-devel/llvm-3.8.1, sys-devel/llvm-3.8.1-r2

14 files changed, 377 insertions, 32 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 27b27e48..52ad79a5 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -48,6 +48,15 @@ AUX 3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f
 AUX 3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch 1130 SHA256 df99addad6f7ea387d27c8dc282681f1a7358653ac207802cacc585c9bd9f350 SHA512 48cdd9d720877b9b91940ea40c1c95f585b500d9ad6f1973453cb335a2be02f48b57c8d6ec3a59356c360c7e23fe2cd9ab9f648d6b966f606593fcbe74e8ef1e WHIRLPOOL 23d90689da0c947166bd0369b0e3b51375144fb9f81b5a0d45cdacaa14b0d5828bd78fcdaf6331abf9697faf1579557e8d0285e3e2cf53ddfd546ce73e57e5d2
 AUX 3.9.0/lldb/six.patch 766 SHA256 fbd732d0f2a5fe0b2d0b5507525cff250efe868384cfd7c5a638586de8608b15 SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2 WHIRLPOOL 5b02d5b6aacf1fa27a599a86cb35b771b855672bd2150baa3518e026a958e7e97b4e9ac04dd44c75b3de61057139aaec1315442127ad37d7f842c24cc454dd77
 AUX 3.9.0/llvm-config-r1.patch 3310 SHA256 263e4c9724c3faee0d800c0c6793bbf7529928214911f174fab47a4cb57e507f SHA512 4c77807a509ba4d7549ea11eaa5cb6e8d8c01eb8479b9d2128f6afd42fd8b1cb2d0bf5ae86470df94027f855f5fa0050c08612ca8dcb3ac08fc7848aa5f5fd5f WHIRLPOOL 1d49c5b735bc6426ecf5b14ccf5a5ba3af81f7ae6a00298abccf1882ce9b6ae193c7e4f6eafe639862c3c9651c0b88fa53dacd60a0e24d2bb5916e2826150270
+AUX 3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch 2789 SHA256 312d5430d4e0e8bf326933076add1b940e26ba143f5e02afab5c283242c0601d SHA512 b62de1ff6d21af62cb03f34044205fc3bccf504f437585e1823824f03424e0f0f13b1ce4839968c2ebc6df7f1539ee57e5e1dc1c6793f795ff002e079b5015b9 WHIRLPOOL 4efb7545846188483ae0ae302ef3235e2c5d7999c86642941c9161901317933f5cd77821defd8394fb1d25967532ae9b8ad34fba625d55401e17c85de8a095bb
+AUX 3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch 852 SHA256 5c05fb0d3249bca21be5c682a757df8a8cbc8274130a1c9c25765af2abc1b8ea SHA512 984661533fca4a0a012f1a556e863e504eaac48d785c0f4b5ac01ffde37c2e34cf1bc2bbb10f26ea770ef1db629cb4f3f6ca44a3c07c43ce0b72ffe3990206f7 WHIRLPOOL 7e8d91e2b5ecad6e23d4bb07ed8bb72a26338d42dee5b1dc98da60e3b2df3bf3380df3cc65bd615399eccb878fc5a07ecee7b88332e5098c743566ed57bea8dc
+AUX 3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1444 SHA256 25f9ff4fa569aac91b259e12bc58fe8a349daf8447a3176b6bfdec174dad36cc SHA512 7824cf0501bd6ca392170658975dc172eab0b36893410ad960c3bcc882ec0ac03eea4784605544f876cdb15f1770c9dbe525bed0cc7791b68b0b73b35a95711d WHIRLPOOL 866856f2db6e5aa40967a67b1dd0e6d5aacdadba6f00477bf35a8779f9783d9daa90f69ebbd572f3cd772cd4f16956918077b9e5b78b9922876c9301976d41e5
+AUX 3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 993 SHA256 1a1d72ba970817623d15804249283f0ad3686bfb164e04c0fc3f912f92e77088 SHA512 b424f4b1e35c5f0e65a6c62a241b62407928efd9128e00e6052da05e9fcf9ba71bdcb1f6c7acf894dab0c38ea5cdff8438f6e7cf4cc1b06e14dff345ad21474f WHIRLPOOL 37894200567303423606a511a321e056c61e3061f234040351b594ed35ccf2979a1977da2daf50c07849bcf9a0ec16ba57eb8b65763e87b23e78325d7b2d968d
+AUX 3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch 1689 SHA256 255e8cf326d5c7ba04cb24d3227cd9d53cc37de1c191c001a0b44973e916b366 SHA512 755ade61097cf2fbc0f480476d81f17f29a32346b108c93f7b918b606cc1d8b54b06d78fc4dddffdccfab9c7429e4be7232fb8f4a498d239a8524d48e545b102 WHIRLPOOL d03f81f0322e006211e706f4ac87b9a47de31d464017de10fff636a62418bb34835f641ec872b8d599611fb2e61847c71820f60ec186f5fb4444e2b73f687860
+AUX 3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch 1031 SHA256 a0da8be64c575ec5a353ee33c530569c754df65cf6df04e5abbc29bcda1fccca SHA512 1948de3e7fb38517e00909f285541bcf3d75cb9c51ce7a2dfb7485346dd3409200bf82081a3a83d7e6843fb4cdbac12395ac6b9049f45201c94fc0ffa09d1ad9 WHIRLPOOL 8282dace8d2ba9d111b57b68e0116e92cafe2c070cc82d52518c6a6b4be3dcd37882bb505fcb3b01817eb577261c4f7f1b152bb12def6be52ea9c1625a15c29a
+AUX 3.9.1/clang/darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09
+AUX 3.9.1/lldb/six.patch 766 SHA256 fbd732d0f2a5fe0b2d0b5507525cff250efe868384cfd7c5a638586de8608b15 SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2 WHIRLPOOL 5b02d5b6aacf1fa27a599a86cb35b771b855672bd2150baa3518e026a958e7e97b4e9ac04dd44c75b3de61057139aaec1315442127ad37d7f842c24cc454dd77
+AUX 3.9.1/llvm-config-r1.patch 3310 SHA256 263e4c9724c3faee0d800c0c6793bbf7529928214911f174fab47a4cb57e507f SHA512 4c77807a509ba4d7549ea11eaa5cb6e8d8c01eb8479b9d2128f6afd42fd8b1cb2d0bf5ae86470df94027f855f5fa0050c08612ca8dcb3ac08fc7848aa5f5fd5f WHIRLPOOL 1d49c5b735bc6426ecf5b14ccf5a5ba3af81f7ae6a00298abccf1882ce9b6ae193c7e4f6eafe639862c3c9651c0b88fa53dacd60a0e24d2bb5916e2826150270
 AUX 9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch 934 SHA256 7732411b5bc715b26a4f5fb4e527cdbc155264f1df0037142a5ea03ac3a1ed6c SHA512 db9e7841fcc0af35cdad8806f6996d8d65bd9c7747eb77bd4c5ccb77b0d1daadf260d7576b0383adbff8c41fd816de62f831d90f38501419e14893c23b43ed6d WHIRLPOOL 3fd2f38b369d3ec1f082b6bda46e46f3755fa698d3a9394a582ee6984f96f39700538c25a92f7a29faf4b2a91e732d1f2cbb2974aa897245ac93f7c640b7d012
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 3727 SHA256 35a7bea7f4e089312aecfacc723f31f61bccaee6f94db4ee94249608b6fad051 SHA512 c10eb24eb92ddc881b81733093c6e65acd0d37a0443dc2387f7f51fdef6cd461d3d39827cd3010c54f96f7d3b7e136d7af9c1baf37d5cb523f1afa2d8ae4a0f3 WHIRLPOOL efb54468844f01d7cc2d90d2d5ff9b990df06a2e580d6d5092ebd4e940046719a3f07e657644cdbc8a308267b24938aae20b0195d1901d909ffefcebc2abd68d
 AUX 9999/musl-fixes.patch 1258 SHA256 8b0ae461e2d50f052e71a9498058f3d514c439973af32d0e0bab5ce73efedefa SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f WHIRLPOOL 893934dd9ea093d2c102144be0e6fb80ec846299c662939e7093d21fb38fe237a49909c1c69e5b5839a1686aa0281b8a865eb4162ede3e7e64642b11621c08d5
@@ -155,14 +164,14 @@ EBUILD llvm-3.4.2.ebuild 16332 SHA256 815d7806197383a8599a68f03a452132a3bcf01f6d
 EBUILD llvm-3.4.ebuild 15005 SHA256 e7b0bbb5a72009f0d79dbb0be247400026d0b1a2edaf6900469cef1f29290d1a SHA512 a32c1d128cf4b9be46102db6269dbe2f25bbfc1a31fcf88eff51a928851d99ee1e6730f4a64aafd5ca31c71a91ebcbd76163303b2f02f8d811c7087deee85f18 WHIRLPOOL a223c4a7053f3ed78186192ab4b67ed49c970bc455fcac9b1109787f213e6e8e899e9fe2d7df313e2a9a48243e0a2e050b53d844fa63555a8223b5efae8f4cbe
 EBUILD llvm-3.5.0.ebuild 16084 SHA256 9abff84d568826541804f3cd9d80bddd71b5631b99891511ac1e98473662529f SHA512 20c1f2ea7c14ea4bddc3196fa72205be2db7bfaa0205936d992fdb19c4278b201548e5233b119471cdaa37643b10bf38ddca4f941617eedf4058f00e919c8d1a WHIRLPOOL 99ba511426208c26f5cf4a8069c5216919ba52905afdb07a921bf945485d55b2e4c1ec458d24105ba45f77c4b8a0a6d3456621a925d291e46440d8a5b6117d07
 EBUILD llvm-3.5.1.ebuild 15777 SHA256 c63945a63f92833887ef7edd5e63e4654ac440283965852537027b4f4eead1f9 SHA512 807c07ade9db608562bc9343e6f9a2e9bc3f51c14d82af2df56abee5ab5d056f649dff719a4f7a06a3db8ff814f09b15c0d3f752b67c11350c2e2ec82da19db1 WHIRLPOOL cbce979a5365a1301e4c4c1230a99b6431f7cbef5d1a72932e7b94b4cf2b875ffc015d7c10a549c571c1cf88ac4b9b7d99689f826a776194c20ee5bb87f59bbe
-EBUILD llvm-3.5.2.ebuild 16374 SHA256 a5239af6d89b9aa0714a7c8b8e7eb596bba1e75dcda6b9ae926d7d245978a50c SHA512 455b04336798742b3f2a660387247d15738c52ea7b219bee48e661640025aae3c5b6da4750c01200acf4552c691e1654a66a7ee003629b555a4d366489a30201 WHIRLPOOL 90e8037567c400fc4375cd0e4ec7248fa8e590608d49dbd42f81a8a0d441af59de13d84307e0410c01733def015e9ba42bac9cb1d435ff72e9827d3fa824016d
+EBUILD llvm-3.5.2.ebuild 16374 SHA256 f5225cdf6a69f993a74d4f320d99feee016def180625fd0b1d970b484889502d SHA512 3df799b4f38ede62c863ec41cd416573ae8d2f82e8dafb4e1675b381db76e0d3aacd0abe139120603a118bc0dc12eb8ccd9f28d84073f4bbaf284edcffdbcc42 WHIRLPOOL 9987475f38f0bfe0c2a59fd4e62e292cc627e51fc65b863927d502ae08ed5c4664d792b5c01b7f60257535e23546be6647baefdf821816d8ee23a662a5153d85
 EBUILD llvm-3.6.0.ebuild 15718 SHA256 5cafc9010021eb3745ca33620a7458f95d8469c875ad262aa20d8fa565244dc2 SHA512 d2a3a29e63461285e515a2d63230ff7ffb90f14a1d9d24f438789d45e080dc3f4d7a2a21e3b92bd8642c29961e1a3764901b2dbd2cd5db2f21770af1d2f1bd70 WHIRLPOOL 11855a643f7083e1562cd4d67b47e214f9c6dfce9e1e7fa5fd7ef62bf2c85fc6d8f7ced3be534250d7281c3324d1a0975af3b294eb82031e011a809bb9314539
 EBUILD llvm-3.6.1.ebuild 15970 SHA256 564249e2c2960b48a5c1c3e9ee55bf49ec72a5890abe2b90c1a6233c86dfeda5 SHA512 10f58036be1d6e4967e683e8c73da38b8083eaf13fad0367ab16e0ccc66a0f93fcc332263e8d4adc8f7102e091adc499374ee00663a3997eff40a830a0c76c7c WHIRLPOOL d40cd4d009bd83b08dc9ace117e0a05707727225449ebc60494bd5437ff6c742b4a4f13d3c6e9a8c0242cb74383529d27a6611849b8fcedf31575bc21ad9f0f5
 EBUILD llvm-3.7.1-r1.ebuild 16156 SHA256 26046b7e521ef620b64d80d7eb4fab480a2e0b2bedbd8b78ab5ec9992992ece7 SHA512 bf82d1850bab723539c66ae8a6ae1bf60c727c0f0f5b6dc1973025f0bfb1db9c92c5179c4acfd4ba6d66edd45b3fb1bc1bdf4a30ff897017fd7969100074dc87 WHIRLPOOL 970139cca11933f733548c9d112ed38b02838106c750fe57ed674719b43bccb7e40d74d902508a81c0635242b4428e2f1ee47d70a0a8474557c5c64d6b381aac
 EBUILD llvm-3.7.1-r2.ebuild 16308 SHA256 5c5861a1876d235a115b31cfe491782cd49321d5ae3da4d0f7cb39bec240183b SHA512 7a62faa31d87a175668567ea4d7282a979337949383fa8fa31f2e09ca419fe21ae47b4ffd711b4cb3aaa09ef7d4a8e54447760068b03583bc64645f6ff995816 WHIRLPOOL 72034a7bf8d157eeb1aaa260a8f6f2d70d7133f7ff53746bc69767f72f7cf653eae2fb24eb1f74026593bf730743dbbf4ce08097cd73bc6a7f9267303fc55740
-EBUILD llvm-3.7.1-r3.ebuild 16971 SHA256 f0064f34c4d147c5267127899e69cab9841b51740156f52b09624a37eb3a3f87 SHA512 4d9d8d4769b41a8b9d3eaea4f36916905dc9abce3ba9d3311f719db05f09470ff2e687071cd04f04645e6f67c35fb2570645403cc27bd750367341121051d81c WHIRLPOOL eac80300057eb4db4603dbe310d89ecef8437c8bd88e032c9b719063c21ecb0d10f18ea4f6a3c0cb396eb490de998174e49589085abf6a1decb58c8e789403ea
+EBUILD llvm-3.7.1-r3.ebuild 16971 SHA256 893e37ac4d062f4cf24a8b5304db0b73931fd1fdab0ef8f39c79ab88514885f1 SHA512 1c6b3c36737bd622d4fffabbd43c7506a6d29fcf7150d8039943b36c453b9e8ef890ea46fd5a4a86d62afc3de33cd1b8a4f355c5b3819880c3fd0d83e39fc097 WHIRLPOOL 74faca20a578ef5860eadcc1634ee0104c8a50807ffab80a545194850ea13d0635e8fd364e10ecf90c794f2bde2ff92a8a87dc0e1d58245fdb4f8d735cc292f7
 EBUILD llvm-3.7.1.ebuild 16125 SHA256 dbe9e049646a46d71bf50ef8e5a91b76cc91103c7b2cc76e497077cbe8bc492c SHA512 dd3c7495e66b50d6b72ae3d8745c0ae3b965cbbeac56775f28148de484f0c781ac821ca730b031be7d9a77d6bbed63323747c2bfcdb4c74e59921bb38ae476ba WHIRLPOOL cd8a617b69ab58dfaf026b6647ad872e32d64adb9189f9a98d3d44242ebb655c07aee3e0bba0cde26d6ddf2d9ce769915406fffba01d68338b32e7e6b9d7e0b3
 EBUILD llvm-3.8.0-r2.ebuild 15483 SHA256 c3e8cfe1fc913b96c1d439014e75386873338b472911ecfe1feea127c6077611 SHA512 4b92381ed484697b8df5d3b4e18e7ccf9e96e1fa9af8ba560fe542d86f7eeffb1599d15dacedacd15e5b98750c608d83c2796cf3d1e017bff9c922c03cbe5943 WHIRLPOOL e821fe0b52e6a19e8172985fe1b6b192e88170fb1e28677a0843450ead2538f7d2168f4f82ceba546e2710961c56462bff1c4138a98a7f3083ee2a45d0de4a63
 EBUILD llvm-3.8.0-r3.ebuild 16527 SHA256 16c986b8538760525b9653db55dbd55a6cd8d8c55d59c64232a1c5bfa2d13c68 SHA512 cd7627e79c5391a84e1b34337c85d72d334ac9bbff54c700ca9e2e9bc018d485f5dbbfd74723a57a5b103ec996fddb2c463dab9af1638d1294df7340f055fa9f WHIRLPOOL 2393188e06fb800ec3182762392be06320248b394ad74f713026d7c4006a976357f9837220c69b59aa637d2b365aaf48376042a990139e6d2b9ed26c117f599a
-EBUILD llvm-3.8.1-r2.ebuild 17606 SHA256 4413ef2ab5be2a8dd422b93abf4e9ed2b7a8d20dfba55f898d62ed986f5f84bb SHA512 c155a0e19fe09083a7e7215cc274048584bb9e95b0979c24a1e0623978ca62243540cd7b791288f0575050895a26abe681b1c9c26d1c12b4653deff08b2eafe8 WHIRLPOOL 1957f4b52a77566f6443bce36cd9c19280f7b06772f0ba82ea0d4374988667fd6c6dce945df56ed8090a599870fb86bb58191621d6848a759a7f0ad142d89177
-EBUILD llvm-3.8.1.ebuild 16642 SHA256 624ec313d78ccfc4bb8150d63171b0b9d61d9c53193bcab3e5fbcc02895a9797 SHA512 927dc6bde1ed3fac784b731ce3155b1968cf6cf74261fbb9e4acfb74539e72a28c696344f882f82672d8080688f8d22a511a1021f388c0e4440f6cad93323287 WHIRLPOOL a543e1ef2515791204bdbf57840b46db97dffd3ad9867ce705790bcc8793fde0573ee7e0ffbd7eb31c20e715346bcab5997c8beaaacccd79cacdf3a94623fe17
+EBUILD llvm-3.8.1-r2.ebuild 17606 SHA256 a9d24ab1495e698ad73f12e725c0323aae370cdd06e6ebc6cf5cb3d96ab4593c SHA512 4b5ff8ea2d1b57014254169ee84c4bcf4dcf4144f20579e85fc085a597b1db8777d6c9fd052ce0f84406e85db6b6641cdb19ef9fbe3aeac7ab4add7be9860ae0 WHIRLPOOL 80c0c820c6e6e2327b8910a173ad96f2366b340361b316b0fb0b7476452cacf254e999c203f6414b24e467cc12d437d168f321f9a40ff7ce467865a846920c59
+EBUILD llvm-3.8.1.ebuild 16642 SHA256 14611f4333119b7013f3b770175c27b02a5346b18e382c47785e83d42dbb676f SHA512 0a486bb333873d2c9a827191b15af282a9774c0b1222aab218059c37a885c5cd18273ad0eb92693e7ee009ee02b88189d4cb49109cff53dbe6ab49dfbb9a325c WHIRLPOOL 0b925d18e942953abb97f6b6d203d9c44ae0e3f9ab0958fe8581d0a79a53f9c20373bb6cd2e0bf4fff1c910d847644e3f398143ab455ddea68056181e46af16f
diff --git a/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
new file mode 100644
index 00000000..367a8a77
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
@@ -0,0 +1,71 @@
+From 2907883b3c504a08b98cf735ceaa8e438d20f37e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 22:46:48 +0200
+Subject: [PATCH 01/10] cmake: Install OCaml modules into correct package
+ location
+
+Ensure that correct libdir is used for OCaml modules, and install them
+into dedicated llvm subdirectory rather than the top directory which is
+supposedly reserved for the standard library.
+
+Author: Mark Wright <gienah@gentoo.org>
+Bug: https://bugs.gentoo.org/559134
+Bug: https://bugs.gentoo.org/559624
+---
+ bindings/ocaml/backends/CMakeLists.txt | 2 +-
+ bindings/ocaml/llvm/CMakeLists.txt     | 2 +-
+ cmake/modules/AddOCaml.cmake           | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/ocaml/backends/CMakeLists.txt b/bindings/ocaml/backends/CMakeLists.txt
+index a980638..9e5dc50 100644
+--- a/bindings/ocaml/backends/CMakeLists.txt
++++ b/bindings/ocaml/backends/CMakeLists.txt
+@@ -23,5 +23,5 @@ foreach(TARGET ${LLVM_TARGETS_TO_BUILD})
+     "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
+ 
+   install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+ endforeach()
+diff --git a/bindings/ocaml/llvm/CMakeLists.txt b/bindings/ocaml/llvm/CMakeLists.txt
+index 4956fa4..c612f73 100644
+--- a/bindings/ocaml/llvm/CMakeLists.txt
++++ b/bindings/ocaml/llvm/CMakeLists.txt
+@@ -8,4 +8,4 @@ configure_file(
+   "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
+ 
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
+-        DESTINATION lib/ocaml)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake
+index e3dd1d8..a16238e 100644
+--- a/cmake/modules/AddOCaml.cmake
++++ b/cmake/modules/AddOCaml.cmake
+@@ -137,7 +137,7 @@ function(add_ocaml_library name)
+   if( APPLE )
+     set(ocaml_rpath "@executable_path/../../lib")
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../lib")
++    set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}")
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+@@ -189,12 +189,12 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   install(FILES ${install_files}
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+   install(FILES ${install_shlibs}
+           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                       GROUP_READ GROUP_EXECUTE
+                       WORLD_READ WORLD_EXECUTE
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+ 
+   foreach( install_file ${install_files} ${install_shlibs} )
+     get_filename_component(filename "${install_file}" NAME)
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
new file mode 100644
index 00000000..b90527a0
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
@@ -0,0 +1,28 @@
+From 726806d9b4932287d67f9b6b112099648ea008b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:01:47 +0200
+Subject: [PATCH 02/10] cmake: Make OCaml docs dependent on LLVM_BUILD_DOCS
+
+Author: Bernard Cafarelli <voyageur@gentoo.org>
+Bug: https://bugs.gentoo.org/562008
+Patch: https://reviews.llvm.org/D23763
+---
+ docs/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index eaa1750..f2cd7e9 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -115,7 +115,7 @@ if (LLVM_ENABLE_SPHINX)
+ endif()
+ 
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
+-if( NOT uses_ocaml LESS 0 )
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
+   set(doc_targets
+         ocaml_llvm
+         ocaml_llvm_all_backends
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
new file mode 100644
index 00000000..76adf52f
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
@@ -0,0 +1,37 @@
+From 1251ac2021b768d3a56b4dc03212ea2fd12a34dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 8 Jun 2015 06:43:00 +0200
+Subject: [PATCH 03/10] cmake: Support overriding Sphinx HTML doc install
+ directory
+
+Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to
+override Sphinx HTML doc install directory.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23780
+Patch: https://reviews.llvm.org/D23757
+---
+ cmake/modules/AddSphinxTarget.cmake | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake
+index 045dc23..fac143f 100644
+--- a/cmake/modules/AddSphinxTarget.cmake
++++ b/cmake/modules/AddSphinxTarget.cmake
+@@ -53,8 +53,12 @@ function (add_sphinx_target builder project)
+                 DESTINATION share/man/man1)
+ 
+       elseif (builder STREQUAL html)
+-        install(DIRECTORY "${SPHINX_BUILD_DIR}"
+-                DESTINATION "share/doc/${project}")
++        string(TOUPPER "${project}" project_upper)
++        set(${project_upper}_INSTALL_HTML "share/doc/${project}/html"
++            CACHE STRING "HTML documentation install directory for ${project}")
++
++        install(DIRECTORY "${SPHINX_BUILD_DIR}/."
++                DESTINATION "${${project_upper}_INSTALL_HTML}")
+       else()
+         message(WARNING Installation of ${builder} not supported)
+       endif()
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
new file mode 100644
index 00000000..94a81574
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
@@ -0,0 +1,33 @@
+From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 8 Jun 2015 14:29:03 +0200
+Subject: [PATCH 04/10] cmake: Add an ordering dep between HTML & man Sphinx
+ targets
+
+Add a dependency between HTML & manpage Sphinx targets to prevent two
+instances of Sphinx from running in parallel, and therefore solves race
+conditions reusing the same doctree directory.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23781
+Patch: https://reviews.llvm.org/D23755
+---
+ docs/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index f2cd7e9..179a65b 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -109,6 +109,9 @@ if (LLVM_ENABLE_SPHINX)
+ 
+     if (${SPHINX_OUTPUT_MAN})
+       add_sphinx_target(man llvm)
++      if (${SPHINX_OUTPUT_HTML})
++        add_dependencies(docs-llvm-html docs-llvm-man)
++      endif()
+     endif()
+ 
+   endif()
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
new file mode 100644
index 00000000..931eb56e
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
@@ -0,0 +1,35 @@
+diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
+index fa7780f..e3a6c8f 100644
+--- a/tools/clang/lib/Driver/Driver.cpp
++++ b/tools/clang/lib/Driver/Driver.cpp
+@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple,
+   if (ClangResourceDir != "") {
+     llvm::sys::path::append(P, ClangResourceDir);
+   } else {
+-    StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX);
+-    llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang",
++    llvm::sys::path::append(P, "..", "lib", "clang",
+                             CLANG_VERSION_STRING);
+   }
+   ResourceDir = P.str();
+diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
+index f078b37..0c514fc 100644
+--- a/tools/clang/lib/Frontend/CompilerInvocation.cpp
++++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1097,7 +1097,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
+   if (ClangResourceDir != "")
+     llvm::sys::path::append(P, ClangResourceDir);
+   else
+-    llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX,
++    llvm::sys::path::append(P, "..", "lib",
+                             "clang", CLANG_VERSION_STRING);
+ 
+   return P.str();
+diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
+index 7de5fbe..49f439b 100644
+--- a/tools/clang/lib/Headers/CMakeLists.txt
++++ b/tools/clang/lib/Headers/CMakeLists.txt
+@@ -100,4 +100,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
+   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
++  DESTINATION lib/clang/${CLANG_VERSION}/include)
diff --git a/sys-devel/llvm/files/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
new file mode 100644
index 00000000..0b93deba
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
@@ -0,0 +1,28 @@
+From d07632abe23d55eec2aae303a142a97765a77d32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 9 Jun 2015 12:20:06 +0200
+Subject: [PATCH 2/2] cmake: Make CLANG_LIBDIR_SUFFIX overridable
+
+Make CLANG_LIBDIR_SUFFIX a cache variable so that it can be explicitly
+overriden. It is used purely to find the LLVMgold.so plugin, so we want
+to set it to native suffix.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 357286b..647f976 100644
+--- a/tools/clang/CMakeLists.txt
++++ b/tools/clang/CMakeLists.txt
+@@ -203,7 +203,7 @@ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
+   "Vendor-specific uti.")
+ 
+ # The libdir suffix must exactly match whatever LLVM's configuration used.
+-set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}")
++set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING "")
+ 
+ set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+-- 
+2.4.3
+
diff --git a/sys-devel/llvm/files/3.9.1/clang/darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.9.1/clang/darwin_prefix-include-paths.patch
new file mode 100644
index 00000000..ed332f3f
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/clang/darwin_prefix-include-paths.patch
@@ -0,0 +1,18 @@
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp
++++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -233,6 +233,7 @@
+     case llvm::Triple::Bitrig:
+       break;
+     default:
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
+       // FIXME: temporary hack: hard-coded paths.
+       AddPath("/usr/local/include", System, false);
+       break;
+@@ -505,6 +506,7 @@
+   // Add the default framework include paths on Darwin.
+   if (HSOpts.UseStandardSystemIncludes) {
+     if (triple.isOSDarwin()) {
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true);
+       AddPath("/System/Library/Frameworks", System, true);
+       AddPath("/Library/Frameworks", System, true);
+     }
diff --git a/sys-devel/llvm/files/3.9.1/lldb/six.patch b/sys-devel/llvm/files/3.9.1/lldb/six.patch
new file mode 100644
index 00000000..324f2b89
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/lldb/six.patch
@@ -0,0 +1,13 @@
+diff -Naur llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py
+--- llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py	2015-12-11 16:43:36.000000000 +0100
++++ llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py	2016-03-09 14:12:15.614483414 +0100
+@@ -720,9 +720,6 @@
+         bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir)
+ 
+     if bOk:
+-        bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
+-
+-    if bOk:
+         bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs,
+                                                        strFrameworkPythonDir,
+                                                        strCfgBldDir)
diff --git a/sys-devel/llvm/files/3.9.1/llvm-config-r1.patch b/sys-devel/llvm/files/3.9.1/llvm-config-r1.patch
new file mode 100644
index 00000000..38505f15
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/llvm-config-r1.patch
@@ -0,0 +1,73 @@
+From 7422ff662be0daeb3931fde397f1fed8ff86c50d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 20 Aug 2016 23:47:41 +0200
+Subject: [PATCH] llvm-config: Clean up exported values, update for shared
+ linking
+
+Gentoo-specific fixup for llvm-config, including:
+- wiping build-specific CFLAGS, CXXFLAGS,
+- updating library suffixes for shared libs,
+- wiping --system-libs for shared linking,
+- making --src-root return invalid path (/dev/null),
+- making --build-mode return "Release" rather than "Gentoo".
+
+Thanks to Steven Newbury for the initial patch.
+
+Bug: https://bugs.gentoo.org/565358
+Bug: https://bugs.gentoo.org/501684
+---
+ tools/llvm-config/CMakeLists.txt  | 11 ++++++++---
+ tools/llvm-config/llvm-config.cpp |  9 +++++++--
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
+index 83794bb..eba6f45 100644
+--- a/tools/llvm-config/CMakeLists.txt
++++ b/tools/llvm-config/CMakeLists.txt
+@@ -23,6 +23,10 @@ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
+ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
+ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
+-set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
+-set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
++# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler
++# specific flags will be set when we don't know what compiler will be used
++# with external project utilising llvm-config.  C++ Standard is required.
++# TODO: figure out if we can remove -std=c++11 and move it to revdeps.
++set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
++set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
+ set(LLVM_BUILD_SYSTEM cmake)
+ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
+@@ -31,5 +35,6 @@ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
+ set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
+ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
+-set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
++# We don't do static libs, so we don't need to supply any system-libs
++set(LLVM_SYSTEM_LIBS "")
+ if(BUILD_SHARED_LIBS)
+   set(LLVM_ENABLE_SHARED ON)
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 80f6279..309c5dc 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -485,5 +485,6 @@ int main(int argc, char **argv) {
+         OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';
+       } else if (Arg == "--build-mode") {
+-        OS << build_mode << '\n';
++        // force Release since we force non-standard Gentoo build mode
++        OS << "Release" << '\n';
+       } else if (Arg == "--assertion-mode") {
+ #if defined(NDEBUG)
+@@ -501,5 +502,9 @@ int main(int argc, char **argv) {
+         OS << ActivePrefix << '\n';
+       } else if (Arg == "--src-root") {
+-        OS << LLVM_SRC_ROOT << '\n';
++        if (IsInDevelopmentTree) {
++          OS << LLVM_SRC_ROOT << '\n';
++        } else {
++          OS << "/dev/null\n";
++        }
+       } else {
+         usage();
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 4fd3ca5b..9f746949 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 762055be933aab193c27714c1389f29ec7ea0c2c $
+# $Id: d9468a839d157dcde2fd986b0265501a27b96478 $
 
 EAPI=5
 
@@ -185,7 +185,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
-		epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		if use prefix; then
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 902665ce..ce73ca7b 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: ac91baf3d437285cf6c8d2dd054702a40b59eaf0 $
+# $Id: b1e9ceb1ddc48d36841fb8de5bb17b68e80857c5 $
 
 EAPI=6
 
@@ -157,17 +157,17 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+	eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+	eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -202,7 +202,7 @@ src_prepare() {
 
 		eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
 
-		eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		# Fix -isystem support in ccc-analyzer
@@ -223,7 +223,7 @@ src_prepare() {
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 6a7039b1..336b4b57 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 53dd9100947ce675f56438f2089e1197d8ce183c $
+# $Id: 9eff8cd66726a6b26dbfa2b8935240740cd1d8b0 $
 
 EAPI=6
 
@@ -157,17 +157,17 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+	eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+	eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -178,7 +178,7 @@ src_prepare() {
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/3.9.0/llvm-config-r1.patch
+	eapply "${FILESDIR}"/3.9.1/llvm-config-r1.patch
 
 	# Restore SOVERSIONs for shared libraries
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
@@ -204,7 +204,7 @@ src_prepare() {
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
 		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch
@@ -222,7 +222,7 @@ src_prepare() {
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
 		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
@@ -232,7 +232,7 @@ src_prepare() {
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -261,7 +261,7 @@ src_prepare() {
 		sed -e 's/add_subdirectory(readline)/#&/' \
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 		# Do not install bundled six module
-		eapply "${FILESDIR}"/3.9.0/lldb/six.patch
+		eapply "${FILESDIR}"/3.9.1/lldb/six.patch
 	fi
 
 	# User patches
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 5330f82b..e49f55b3 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 07d910bf3ef0c0f30fe661178ffa278f15ebb3d2 $
+# $Id: fb0575f215206a05cae3eeccfe833a8cd9788c00 $
 
 EAPI=6
 
@@ -158,17 +158,17 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+	eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+	eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -199,7 +199,7 @@ src_prepare() {
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
 		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch
@@ -209,7 +209,7 @@ src_prepare() {
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
 		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
@@ -219,7 +219,7 @@ src_prepare() {
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -244,7 +244,7 @@ src_prepare() {
 		sed -e 's/add_subdirectory(readline)/#&/' \
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 		# Do not install bundled six module
-		eapply "${FILESDIR}"/3.9.0/lldb/six.patch
+		eapply "${FILESDIR}"/3.9.1/lldb/six.patch
 	fi
 
 	# User patches