Update sys-devel/llvm-3.7.1-r3, sys-devel/llvm-3.8.0-r3, sys-devel/llvm-3.8.1

author: Stuart Shelton <stuart@shelton.me> 2016-09-25 02:23:23 +0100
committer: Stuart Shelton <stuart@shelton.me> 2016-09-25 02:23:23 +0100
commit: 605220661414f49e08cd8af496da1785f911ee13 (patch)
tree: eedac58221ec92e1470b55114b8b1d4fd62dc457 /sys-devel/llvm
parent: Add dev-lang/perl-5.20.2, dev-lang/perl-5.22.2, dev-lang/perl-5.24.0-r1, upda... (diff)
download: srcshelton-605220661414f49e08cd8af496da1785f911ee13.tar.gz
srcshelton-605220661414f49e08cd8af496da1785f911ee13.tar.bz2
srcshelton-605220661414f49e08cd8af496da1785f911ee13.zip
19 files changed, 276 insertions, 336 deletions
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7353ac34..51c05434 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,3 +1,7 @@
+AUX 3.4.2/clang/darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab
+AUX 3.4.2/clang/gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68
+AUX 3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845
+AUX 3.4.2/gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654edddd4c4a16f0f138357c813a40aa9a75b SHA512 e946e1fd422f49d2e150bd641bac0ffe6ea6757b2e6119465090a3c7f5cf69e17c00221bcf67a7fcf29628d93463fb1c57d0d009ff7834151440d779f2d33484 WHIRLPOOL 171f167802ee289716232e16a2c507e3b8dc7913b40df29c55a815ff88596871a1a970c891b0e9b361186cada4d8898e65920d014b4e6eb2178cc207f61bf6da
 AUX 3.5.0/fix_LLVMExports_cmake.patch 1563 SHA256 924303a7fa7ee46276eb2984e3e2d9304873df1d63c0d878371cf98b4094aef0 SHA512 8e8c3ae2c8e2bac0d78a7f572ccfae9cfc30e52ffbfa953596c075cf6adc4e5881d2b80cad4d87bbf1de837d88352334bb51a331adc8d8db74354945c036637e WHIRLPOOL b525bbf3a7ade5906e9e35315af1ccb50c4392e1d104c516927a3ab9b627bc3d0fcf41bd0b77093f6743131f801d37d53d1065371e5c86eb4e7d538eb969b3a8
 AUX 3.5.2/clang/gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd
 AUX 3.5.2/gcc-5.1.patch 516 SHA256 c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2 SHA512 dd12f9ad7b80625477c5af045cd16233a169c67f62bbc1fa1aaa8b0c975b585b447fcf0773e2fc4f83cc767967fd5fd3678527e447fef66841f40d98927ec4b3 WHIRLPOOL 628021a89d48b74d302199f75a827b89d8fa2ce6909ecba93f5dd64f584a6dc215a0b3cb6b46267d1fd7488594b3ca64de44a867905949e61ae5552cbb30fc82
@@ -19,26 +23,20 @@ AUX 3.7.1/llvm-config-1.patch 17604 SHA256 6e93b92df89a94becd084479867e0251b13a2
 AUX 3.7.1/llvm-config-2.patch 4918 SHA256 42a54aaf38fc24317bcc0e268b356320442eebe8a7f54c0179dcf6dabd1776fe SHA512 67adf538672cf5304ad9861605d3daeb77836d9326808fab9ce498969e202142315d6b260bcfb8b46ff714e3a100c6d9540a2761807159985045e9bb86c87540 WHIRLPOOL db7b60c8b5a19dc9b314faa32812198079257e31ddaf3bc781c14fc6a73a2956f0bf01803a99ef99a0ebb6e9038553b030861a6d7e247ab4c590c92553154c3c
 AUX 3.7.1/llvm-config-3.patch 1193 SHA256 8a9c8cb4199800a88419fc762c7c7e65e2dd2f519cfe4437def0005928c81eea SHA512 ea8670dd9327f75d6fcd5e5f06e2011899e57aa8cb04e00197ad5fcf79c3c5875736dcaa75a0f69664dd4381a7ae434af7eede71d36e1224596549fee5d9573d WHIRLPOOL 1718d5e671faefbba1192c891c1cddb87ac275e446d256637fc48e1275f54465a47e7cffb413bc348e437d2a659b9b9d607d71dc31ae62657a429f75cc058de1
 AUX 3.7.1/msan-fix.patch 3149 SHA256 e939e9403a0caf0cac3e08090ac6dcb872e0ee45cc8f68807d2425dba6ac8423 SHA512 9ab34a764921893af760e54a8513d57b8c6b64eb471c94970ed10d1b83eec458b537df47d30f79a0537ca5b024b9e1ce030f264f1aa8391792d64f06ed19cf8d WHIRLPOOL b198d77179795b0c56adfe3e21d92006579bec3145de880f62c012b95988026f5e5673cf94222b38928f9c88a63c7093c9b60c7ce23508eea727aad11aefad8a
-AUX 3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch 852 SHA256 5c05fb0d3249bca21be5c682a757df8a8cbc8274130a1c9c25765af2abc1b8ea SHA512 984661533fca4a0a012f1a556e863e504eaac48d785c0f4b5ac01ffde37c2e34cf1bc2bbb10f26ea770ef1db629cb4f3f6ca44a3c07c43ce0b72ffe3990206f7 WHIRLPOOL 7e8d91e2b5ecad6e23d4bb07ed8bb72a26338d42dee5b1dc98da60e3b2df3bf3380df3cc65bd615399eccb878fc5a07ecee7b88332e5098c743566ed57bea8dc
 AUX 3.8.1/0005-cmake-Do-not-install-libgtest.patch 886 SHA256 7a38b3f0e6ef9fc25782c39ae46217e7516f852f80d4230699a44d2f7fd576d8 SHA512 95ac1147dad2134a5dd2a2db04449e0186a6a95f7a66af30e58906c6c51b4eb79118d9a55bb348678e51cfdaa14504ebfd8610b4633d8980c7863c998ca7c223 WHIRLPOOL 90317c29ef97642c72761d9f5f9235b42359f509795758474a50dd136486cf5d14a0749f3adf6b2ff04aa00073d74e431bb67a2e8dbc443f390a12f5bf2c157a
-AUX 3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch 1689 SHA256 255e8cf326d5c7ba04cb24d3227cd9d53cc37de1c191c001a0b44973e916b366 SHA512 755ade61097cf2fbc0f480476d81f17f29a32346b108c93f7b918b606cc1d8b54b06d78fc4dddffdccfab9c7429e4be7232fb8f4a498d239a8524d48e545b102 WHIRLPOOL d03f81f0322e006211e706f4ac87b9a47de31d464017de10fff636a62418bb34835f641ec872b8d599611fb2e61847c71820f60ec186f5fb4444e2b73f687860
-AUX 3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch 1031 SHA256 a0da8be64c575ec5a353ee33c530569c754df65cf6df04e5abbc29bcda1fccca SHA512 1948de3e7fb38517e00909f285541bcf3d75cb9c51ce7a2dfb7485346dd3409200bf82081a3a83d7e6843fb4cdbac12395ac6b9049f45201c94fc0ffa09d1ad9 WHIRLPOOL 8282dace8d2ba9d111b57b68e0116e92cafe2c070cc82d52518c6a6b4be3dcd37882bb505fcb3b01817eb577261c4f7f1b152bb12def6be52ea9c1625a15c29a
 AUX 3.8.1/clang/abi-tag-support-mangler.patch 44371 SHA256 bdbf162a9a847f467b4fd74a689f2ab68ad7253e3ffceeb325894eea19eba6c4 SHA512 52b84f6731f7537f8a17370ea5f2784dcbc802c59bb71276fcacde6da61f7c18d7cf1405121ca12f32903e162bece9de7c80778a30f0770dd5a2c39fbcd81e47 WHIRLPOOL b17da7ce03d4a67404f919f3e508892fd4ab4b1c9d752e4626d4f3306c9260023ff5ef19e16eb67bbd9750881f649d65337c0ff56665ba62c53db02f0fa4b1fb
 AUX 3.8.1/clang/abi-tag-support-sema.patch 16490 SHA256 b558b1e91cb73b611e3c8d7eeda952fe4a4c0ecd56b609f5eb5ab5dd42cd9f46 SHA512 66789178512adcc5f6fd2e1bf2adbaa1cf3c19e88f1c3db25417a7709b042794d0dceab479ebd8d5b7da39ee58522d171eb3c9f32420379dfddf93aa9e1bb540 WHIRLPOOL c8c9f5f1105ed412f80af19cf7344aabb13fa4a538f3040a53e36fe141e6b53b88562635a7835627cdd1742d83f2b59125ac3be4038709a310e14d451c9c850a
-AUX 3.8.1/clang/darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09
 AUX 3.8.1/clang/default-libs.patch 3862 SHA256 1974319e1854612b823a72869a764403c13591198032787f4c7d4f71f2bb1429 SHA512 bc2f2be2675f2cfe912d09a23b34440f792de775a84bd576a2abee5374251b3a83c1313de0c6a7ea98bf7480d6d710560587f78594178e0e119382b89b5b7dd3 WHIRLPOOL f72025af7d9d589dd851d9a9611649ed53eee8eee9b5b33af4f22a288871a6c2881997daaeb330b5fa162febf39e23d064805c72916064b41ef5b91d4a1ba58f
 AUX 3.8.1/clang/gcc4.9-search-path.patch 4800 SHA256 bc0d359d971811a1d4fdf4444e72987f7defcc5309af48f2410a410d6e781625 SHA512 8104fe788344718a68e65db5bdee1ba317c6fb9c0c5fab255b6987790e0c4ac6e24abbe10d6ac340176fa4b726cc38c3e8bd282fc993e2155fa96aa98a72e4be WHIRLPOOL b43138f34f3dff9a1841d6476abb312471dda5dfa58732a4cedcbe1a5df576aac5617d44e58202d32c8b11498a8cc1da1913487b866d18556bde93cc7566e7c5
-AUX 3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
 AUX 3.8.1/clang/musl-support.patch 4059 SHA256 9ccbfd618b92f3b9c4911293c7663aa275699e9d6d404a3ae325dc94454badbb SHA512 e5bc61160899493501c2cb029f3a087c0f25fcf4b3ac5701616549dff5fcc2d0a264f274fba3d05396cf9ca599bb40c42f4e53cd5ce1656457dab882e0e4d7fc WHIRLPOOL 45b0e4260c921abb5c8cb0bf1fbff09f11aded006c828c0dbdac0e9b2fb53c80b72884aa31020de75912dac2c45b42e15087b61ed4a0925dab96dd4bac77660c
 AUX 3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch 1106 SHA256 010816607be72e178c21f7b5b8fbe2e70697feb70c4d78e03b498672bff1cc5c SHA512 0081071254eebfa2f550b98290b661664c31ce5e28222d491d9f3522c4822878b50ba6f08c24e1a3f97cc9b1d437e76d50fb94939e37432d048e22825068936a WHIRLPOOL 38f09fcc2db0453974b76c12ca287718d778153496e6fe9237b92026bd6dcddf96dde69c5e406781c9da90fcb0de39327e1c4cb8ab847935e2626697e3acc9f7
 AUX 3.8.1/compiler-rt/arm_march_flags.patch 1210 SHA256 ae5896f281c9e5e3ca00c962fee38cb6c95e3034f60a79a4befecc16c7bfee6f SHA512 b07b1b54fc8ad6141d6fd3335def6c70588dcbf90f81a538238cda70bb7c0acaae4d73f75c8d5f7c42b4c9c687ea2feebd3199606b22635a52a402e2fce4ce9b WHIRLPOOL 246f126c5c5d72e9698fa510f9d19930d860cca017b1588ece4cdbbbdf41d021f5d28fd2ef3b9653707f112a329d0b6eed6ce1b4630e84a2d9d539e3bf7fc628
 AUX 3.8.1/compiler-rt/darwin-default-sysroot.patch 386 SHA256 2bf0ce92f45af93752b207d31f22121c7f774346186725ef785c45b8021c601d SHA512 c107f33b8b58959f4acb3114476d4a6a515f331e04f26ec9baf38db00f483575a6a77475222747081d0e94594254ad04c467cfac623e2dcd1da1fe7c636bbfb0 WHIRLPOOL 03e021f6701d1e876a44fdbf370be986fb0b3373669a5a80d80ac39e7922213aad5af0560382916841d3a26cebc770ed81e6a1c86b7decfffbf3a98c7ca1156d
 AUX 3.8.1/compiler-rt/fbsd.patch 1101 SHA256 1490f7343a7ba632057e7e38e5885b5f2a0c212243673bf06e0ffa5eeac69253 SHA512 f1c23ce15090e2c75f43796dbdb0fef113f55aa633aebf041ab894638221f13dea195409063db663033cfef8963793b2578e16c42b8237bc342107e6d73f22dc WHIRLPOOL bc8b078dca18c5b31abbd45b08b4e17383a007620f730a5331ab7e6dd5d937686d3875589375cfb7280d18e5d327c86fcf9e8cf82f25f91ffa1b9779e8822df5
-AUX 3.8.1/lldb/six.patch 766 SHA256 fbd732d0f2a5fe0b2d0b5507525cff250efe868384cfd7c5a638586de8608b15 SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2 WHIRLPOOL 5b02d5b6aacf1fa27a599a86cb35b771b855672bd2150baa3518e026a958e7e97b4e9ac04dd44c75b3de61057139aaec1315442127ad37d7f842c24cc454dd77
-AUX 3.8.1/llvm-config-r1.patch 3310 SHA256 263e4c9724c3faee0d800c0c6793bbf7529928214911f174fab47a4cb57e507f SHA512 4c77807a509ba4d7549ea11eaa5cb6e8d8c01eb8479b9d2128f6afd42fd8b1cb2d0bf5ae86470df94027f855f5fa0050c08612ca8dcb3ac08fc7848aa5f5fd5f WHIRLPOOL 1d49c5b735bc6426ecf5b14ccf5a5ba3af81f7ae6a00298abccf1882ce9b6ae193c7e4f6eafe639862c3c9651c0b88fa53dacd60a0e24d2bb5916e2826150270
 AUX 3.8.1/llvm-config.patch 4899 SHA256 2c3f1924652351c4e1f0eb59c560a94d333b2719ffe7e25891de9bd4efa203a6 SHA512 48e64847a7d767e67c3eb46342db5336bba96b9359becb0420f244a363968d9c5a856a46f9706c6475b8dcf50884f4257632faddd4ec6a66c8986cdb474ebdb5 WHIRLPOOL b5cb5d66f94c7167fa8d9f2fc7a4f9b41453fb282783200068710ebb3bc6bf9a8e7c892154f31bead88030e9880ad8a2986c93226b80aa17580e6aa7c720b73f
 AUX 3.8.1/musl-env-support.patch 6969 SHA256 67655db254ce20db0e6fe34635b00071760ee1595c25e36ae116017f4195b6c7 SHA512 78a02de068ffb333cdd3c88af16e61512ba5bf1c2b20c7d96661e93841f6ec9f98e7578102ebd598506dce07a85af361e349f48d1fbd4f3f82612e139498ce05 WHIRLPOOL 9cd5288d2732c43a0df59a0113036b1d99f7f88445ed3052d2def0a65267c3ec2aa858e9402ad68bbefe300aa57884fa15a11d5fc0c591ca1290bf86cc6f674d
 AUX 3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch 852 SHA256 5c05fb0d3249bca21be5c682a757df8a8cbc8274130a1c9c25765af2abc1b8ea SHA512 984661533fca4a0a012f1a556e863e504eaac48d785c0f4b5ac01ffde37c2e34cf1bc2bbb10f26ea770ef1db629cb4f3f6ca44a3c07c43ce0b72ffe3990206f7 WHIRLPOOL 7e8d91e2b5ecad6e23d4bb07ed8bb72a26338d42dee5b1dc98da60e3b2df3bf3380df3cc65bd615399eccb878fc5a07ecee7b88332e5098c743566ed57bea8dc
+AUX 3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1444 SHA256 25f9ff4fa569aac91b259e12bc58fe8a349daf8447a3176b6bfdec174dad36cc SHA512 7824cf0501bd6ca392170658975dc172eab0b36893410ad960c3bcc882ec0ac03eea4784605544f876cdb15f1770c9dbe525bed0cc7791b68b0b73b35a95711d WHIRLPOOL 866856f2db6e5aa40967a67b1dd0e6d5aacdadba6f00477bf35a8779f9783d9daa90f69ebbd572f3cd772cd4f16956918077b9e5b78b9922876c9301976d41e5
 AUX 3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch 1689 SHA256 255e8cf326d5c7ba04cb24d3227cd9d53cc37de1c191c001a0b44973e916b366 SHA512 755ade61097cf2fbc0f480476d81f17f29a32346b108c93f7b918b606cc1d8b54b06d78fc4dddffdccfab9c7429e4be7232fb8f4a498d239a8524d48e545b102 WHIRLPOOL d03f81f0322e006211e706f4ac87b9a47de31d464017de10fff636a62418bb34835f641ec872b8d599611fb2e61847c71820f60ec186f5fb4444e2b73f687860
 AUX 3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch 1031 SHA256 a0da8be64c575ec5a353ee33c530569c754df65cf6df04e5abbc29bcda1fccca SHA512 1948de3e7fb38517e00909f285541bcf3d75cb9c51ce7a2dfb7485346dd3409200bf82081a3a83d7e6843fb4cdbac12395ac6b9049f45201c94fc0ffa09d1ad9 WHIRLPOOL 8282dace8d2ba9d111b57b68e0116e92cafe2c070cc82d52518c6a6b4be3dcd37882bb505fcb3b01817eb577261c4f7f1b152bb12def6be52ea9c1625a15c29a
 AUX 3.9.0/clang/darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09
@@ -48,13 +46,10 @@ AUX 3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.
 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 9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch 2789 SHA256 312d5430d4e0e8bf326933076add1b940e26ba143f5e02afab5c283242c0601d SHA512 b62de1ff6d21af62cb03f34044205fc3bccf504f437585e1823824f03424e0f0f13b1ce4839968c2ebc6df7f1539ee57e5e1dc1c6793f795ff002e079b5015b9 WHIRLPOOL 4efb7545846188483ae0ae302ef3235e2c5d7999c86642941c9161901317933f5cd77821defd8394fb1d25967532ae9b8ad34fba625d55401e17c85de8a095bb
-AUX 9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1444 SHA256 25f9ff4fa569aac91b259e12bc58fe8a349daf8447a3176b6bfdec174dad36cc SHA512 7824cf0501bd6ca392170658975dc172eab0b36893410ad960c3bcc882ec0ac03eea4784605544f876cdb15f1770c9dbe525bed0cc7791b68b0b73b35a95711d WHIRLPOOL 866856f2db6e5aa40967a67b1dd0e6d5aacdadba6f00477bf35a8779f9783d9daa90f69ebbd572f3cd772cd4f16956918077b9e5b78b9922876c9301976d41e5
 AUX 9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 993 SHA256 1a1d72ba970817623d15804249283f0ad3686bfb164e04c0fc3f912f92e77088 SHA512 b424f4b1e35c5f0e65a6c62a241b62407928efd9128e00e6052da05e9fcf9ba71bdcb1f6c7acf894dab0c38ea5cdff8438f6e7cf4cc1b06e14dff345ad21474f WHIRLPOOL 37894200567303423606a511a321e056c61e3061f234040351b594ed35ccf2979a1977da2daf50c07849bcf9a0ec16ba57eb8b65763e87b23e78325d7b2d968d
 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 3963 SHA256 499b46653d0d4152246154061a2661dbae30020e524a485ddf5c8c9a79873999 SHA512 fa131054351373081008091cf324cad4465cb6bbbcfd4b98b25b06f64cdb9df89e5eca6da367543f9fedf323ed8d862cbc372271225d7918632ba4770bf2c29d WHIRLPOOL df266e1e94c08cc08478c6bd94e5a45118fa0646006992d1c38d4d50680a90ab0f249958c774b3b63d6616206ddc7acf02ef082ab3be80ea8d9d1312ecaff8ed
+AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 3727 SHA256 35a7bea7f4e089312aecfacc723f31f61bccaee6f94db4ee94249608b6fad051 SHA512 c10eb24eb92ddc881b81733093c6e65acd0d37a0443dc2387f7f51fdef6cd461d3d39827cd3010c54f96f7d3b7e136d7af9c1baf37d5cb523f1afa2d8ae4a0f3 WHIRLPOOL efb54468844f01d7cc2d90d2d5ff9b990df06a2e580d6d5092ebd4e940046719a3f07e657644cdbc8a308267b24938aae20b0195d1901d909ffefcebc2abd68d
 AUX 9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch 860 SHA256 2d0786de5a0cf64c17b03bbd0d77a8c755bf0a2ce65cfb30bb4cad8c9466d11b SHA512 c288491f6eb47ac4cc85af5c7df5d087db27e7d115385121db1dcfe20ac05edcc1610717e275bcb3ecdf12135882a4b1abc70bfdd4190681a3659ba143f6e6d2 WHIRLPOOL 47268adbeba274bb2222de752b58c5b806e6ee0555f7621415ccd94980126090211550fbd012726b451aed78f1dc0286dfc30538beef285053a57ac9900e85fb
-AUX 9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch 1313 SHA256 5f055da0bf06aafd7d81fb91983187e32b39d53424651fbb14e17084bbb16527 SHA512 eba37f74f16971f620bf26f2de0f1b3ecbf78858cd54fa805a540f86668332b2d233f649e9af53f53a66ae4336402e8913f978842492c2aea3b84710004bba48 WHIRLPOOL f48b1f758fe7e217fc19b6de32132d2291a51eed560fa45c8bcb8cdb4942889cc57ccf6ed61bd944ec21b66e06c8f99496f72e4560cf9b28d963fdcaa47bf590
-AUX 9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch 917 SHA256 2c838be33f093c1f423639a54ff69517d7a9d82a11b096c1e7253fa84b5a1b7b SHA512 7ff781f894ab54bbb283e07bd69879e8b2d41d70bc41bed2b06d713f6dc2d9f1274c3253cebdecd971546eccec153b6d531f2ac7be28f0d795c171e8392f44ff WHIRLPOOL ca8fc5c11d807b63717dc94c554d55c5880948804a4d734aa9ec55f228535ab760d89bea2969795e8b6e3073440c69773c861c1899c5cbbef25bae87aa9398b3
 AUX 9999/musl-fixes.patch 1258 SHA256 8b0ae461e2d50f052e71a9498058f3d514c439973af32d0e0bab5ce73efedefa SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f WHIRLPOOL 893934dd9ea093d2c102144be0e6fb80ec846299c662939e7093d21fb38fe237a49909c1c69e5b5839a1686aa0281b8a865eb4162ede3e7e64642b11621c08d5
 AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845
 AUX clang-3.4-darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab
@@ -165,8 +160,8 @@ EBUILD llvm-3.6.0.ebuild 15718 SHA256 5cafc9010021eb3745ca33620a7458f95d8469c875
 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 16532 SHA256 6a902d6db1e23cfb14ad8c4b1ff392212dbfda4423776605a9eb9c7a50beed6e SHA512 162043ffc94209e4e1fa9e435f674430f232ffc447872e04086b3c580f35fc371b0be2393223383cbb7d1795b7282f26dd2a91e3a800acab602e8fedd43ce0e6 WHIRLPOOL 9f009f7752c116ac8b68c5db78ada163ba3064e87c2da5eac67b101a39c81a7b934c3baa49290777ecad75dbe399e8fecac7be177040d2e48255226e5c6294f8
+EBUILD llvm-3.7.1-r3.ebuild 16533 SHA256 b3301e4e1200c478cdc13d855eeb6df86e8d861f14a56105efd08eb2d8bc526b SHA512 74685b963c899e7a032a12bdc3523dfd52fa2b203a2afe03d6ac6ad0f7d93ce742a7ed3daebdee82498c8eca9325de124ec035a6d7618c17d6322cbb9045aba3 WHIRLPOOL 9c5cf2a8bbe0a55b1240e7530acb2082cf353ac4e96a3e10ce62341ff2816b9549907cbe3e7aa959a5e574fc25862655de0cfc00ae30a8d25aa2a1495e84347e
 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 16135 SHA256 7248f8bf71e2217a5cf9f3432b1b24ddb11c2c4725f33a408a4a2457b57a27ff SHA512 75779352989f797d3bab8d6f2bd8cb6a4d0d69808017be799c4d1032391d0732fdd70014eb3268f82c6e48dbcffac08a64d3a84a84148c8112bdeb00a0653769 WHIRLPOOL 3554990d93491d834a6eb4a1f55614a0694c97a9c0f5f5a77e8aaca8c36cf957bff8c31837113009d617804a769a65580b9cd1b042c4da9ba3b993b100b8932a
-EBUILD llvm-3.8.1.ebuild 16200 SHA256 15f3befcfa4586e8095ecd69271401a897f0f5ddbaea4b37057b10d96004d7de SHA512 7ad6b947a02f723005d702754d57adca2187728008ac8664f8ce3ba55b883155e99d061096f689aa9ee2b57de5a1fee8af13a05ba304922ea3fd7ae1a13366d1 WHIRLPOOL d8d428f2333d20c8c4aca677fee3071192cc9cb6aff91dfd3650c7d8a65862bcde3e9adc49eda3360e160f70ce55a90cf3a7d3537e31cd4ec1ab99a6e15bf9bc
+EBUILD llvm-3.8.0-r3.ebuild 16136 SHA256 8be29dd9c9247b9d9277711844f7900f7d2f9375f5aefb0b5d0b8711ea2ea804 SHA512 92d1dafe058c9a396348e9f20e82634e32ee51920f4d6b0ceb1dfc8e448f9786630e8ddb20b074892ea761aae292df7e76da048f6e02f326197398e2172fcddb WHIRLPOOL da70aa51b24cd114ce4234fb8eb2a9bf46f11f063400b7e7e3828d1e6669a8d6fba2ba0524c220f8491b8e60b074b9636028a0b8bd0dfa3df7f2491c5a852ad6
+EBUILD llvm-3.8.1.ebuild 16201 SHA256 6b1f67c2271755e58286ec7289acc5be17ac524a3f5988d21860c23e93719ba6 SHA512 852a88743a85580994107e371edb23f3109edb1488605733d292249d496231320ec3dc2eb073c370627538b06a12aeee1b3ec6b50841838d1bd0e76ca2c78638 WHIRLPOOL c631d0fba2d1be2c323e4c257a33787fbe0bdc692480a9abc93d908f9c6e28ca1cd6019208edf10a1a6c2530642e0bbd0a185ced2cd214db676f802cbc75d989
diff --git a/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch
new file mode 100644
index 00000000..113b04bc
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch
@@ -0,0 +1,47 @@
+Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get
+"unable to interface with target machine" errors while building if we
+attempt to.  Disable those targets.
+
+Patch by Reza Jelveh from
+https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch
+
+--- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+@@ -27,20 +27,20 @@ UniversalArchs :=
+ # Soft-float version of the runtime. No floating-point instructions will be used
+ # and the ABI (out of necessity) passes floating values in normal registers:
+ # non-VFP variant of the AAPCS.
+-Configs += soft_static
+-UniversalArchs.soft_static := armv6m armv7m armv7em armv7
++# Configs += soft_static
++# UniversalArchs.soft_static := armv6m armv7m armv7em armv7
+ 
+ # Hard-float version of the runtime. On ARM VFP instructions and registers are
+ # allowed, and floating point values get passed in them. VFP variant of the
+ # AAPCS.
+ Configs += hard_static
+-UniversalArchs.hard_static := armv7em armv7 i386 x86_64
++UniversalArchs.hard_static := i386 x86_64
+ 
+-Configs += soft_pic
+-UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
++# Configs += soft_pic
++# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
+ 
+ Configs += hard_pic
+-UniversalArchs.hard_pic := armv7em armv7 i386 x86_64
++UniversalArchs.hard_pic := i386 x86_64
+ 
+ CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding
+ 
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \
+ 	profile_osx.a profile_ios.a \
+ 	ubsan_osx.a
+ RuntimeLibrary.darwin_embedded.Configs := \
+-	soft_static.a hard_static.a soft_pic.a hard_pic.a
++	 hard_static.a  hard_pic.a
+ 
+ # Support building compiler-rt with relocatable SDKs.
+ #
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch
new file mode 100644
index 00000000..0a1d9eb3
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch
@@ -0,0 +1,80 @@
+From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 Jun 2014 19:35:33 +0200
+Subject: [PATCH] clang gentoo fixes
+
+---
+ tools/clang/lib/Driver/Tools.cpp        | 6 +++---
+ tools/clang/tools/scan-build/scan-build | 4 ++--
+ tools/clang/tools/scan-view/scan-view   | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+index b013eb5..dbbcacb 100644
+--- a/tools/clang/lib/Driver/Tools.cpp
++++ b/tools/clang/lib/Driver/Tools.cpp
+@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args,
+   // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
+   // not supported by old linkers.
+   std::string ProfileRT =
+-    std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
++    "-l:libprofile_rt.a";
+ 
+   CmdArgs.push_back(Args.MakeArgString(ProfileRT));
+ }
+@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   // forward.
+   if (D.IsUsingLTO(Args)) {
+     CmdArgs.push_back("-plugin");
+-    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
++    std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+ 
+     // Try to pass driver level flags relevant to LTO code generation down to
+@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   // forward.
+   if (D.IsUsingLTO(Args)) {
+     CmdArgs.push_back("-plugin");
+-    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
++    std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+ 
+     // Try to pass driver level flags relevant to LTO code generation down to
+diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build
+index 0f119f6..58f78d9 100755
+--- a/tools/clang/tools/scan-build/scan-build
++++ b/tools/clang/tools/scan-build/scan-build
+@@ -419,7 +419,7 @@ sub CopyFiles {
+ 
+   my $Dir = shift;
+ 
+-  my $JS = Cwd::realpath("$RealBin/sorttable.js");
++  my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js");
+   
+   DieDiag("Cannot find 'sorttable.js'.\n")
+     if (! -r $JS);  
+@@ -429,7 +429,7 @@ sub CopyFiles {
+   DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
+     if (! -r "$Dir/sorttable.js");
+     
+-  my $CSS = Cwd::realpath("$RealBin/scanview.css");
++  my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css");
+   
+   DieDiag("Cannot find 'scanview.css'.\n")
+     if (! -r $CSS);
+diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view
+index fb27da6..1f8ddb8 100755
+--- a/tools/clang/tools/scan-view/scan-view
++++ b/tools/clang/tools/scan-view/scan-view
+@@ -54,7 +54,7 @@ def start_browser(port, options):
+     webbrowser.open(url)
+ 
+ def run(port, options, root):
+-    import ScanView
++    from clang import ScanView
+     try:
+         print 'Starting scan-view at: http://%s:%d'%(options.host,
+                                                      port)
+-- 
+2.0.0
+
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
new file mode 100644
index 00000000..49f10853
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
@@ -0,0 +1,29 @@
+diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp
+--- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:32:31.593191000 -0400
++++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:38:31.733163513 -0400
+@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC
+     Prefixes.push_back(D.InstalledDir + "/..");
+   }
+ 
++  llvm::OwningPtr<llvm::MemoryBuffer> File;
++  for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
++    if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File))
++    {
++      bool Exists;
++      const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
++      const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
++      if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists)
++      {
++        Version = GCCVersion::Parse(VersionText);
++        GCCInstallPath = GentooPath;
++        GCCParentLibPath = GCCInstallPath + "/../../..";
++        GCCTriple.setTriple(CandidateTripleAliases[k]);
++        IsValid = true;
++        return;
++      }
++    }
++  }
++
+   // Loop over the various components which exist and select the best GCC
+   // installation available. GCC installs are ranked by version number.
+   Version = GCCVersion::Parse("0.0.0");
diff --git a/sys-devel/llvm/files/3.4.2/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/gentoo-install.patch
new file mode 100644
index 00000000..a2ba7dee
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/gentoo-install.patch
@@ -0,0 +1,96 @@
+From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 19 Aug 2013 13:22:46 +0200
+Subject: [PATCH] gentoo install fixes
+
+---
+ Makefile.config.in                      | 6 +++---
+ Makefile.rules                          | 6 +++---
+ tools/llvm-config/BuildVariables.inc.in | 2 ++
+ tools/llvm-config/Makefile              | 4 ++++
+ tools/llvm-config/llvm-config.cpp       | 5 +++--
+ utils/FileCheck/Makefile                | 2 +-
+ 7 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.config.in b/Makefile.config.in
+index dcca45f..e75ae2e 100644
+--- a/Makefile.config.in
++++ b/Makefile.config.in
+@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix)
+ endif
+ 
+ PROJ_bindir     := $(PROJ_prefix)/bin
+-PROJ_libdir     := $(PROJ_prefix)/lib
++PROJ_libdir     := $(PROJ_prefix)/$(GENTOO_LIBDIR)
+ PROJ_datadir    := $(PROJ_prefix)/share
+-PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+-PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
++PROJ_docsdir    := $(PROJ_prefix)/share/doc/@PF@
++PROJ_etcdir     := @EPREFIX@/etc/llvm
+ PROJ_includedir := $(PROJ_prefix)/include
+ PROJ_infodir    := $(PROJ_prefix)/info
+ PROJ_mandir     := $(PROJ_prefix)/share/man
+diff --git a/Makefile.rules b/Makefile.rules
+index e53598b..217f754 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
+   BuildMode := Release
+   # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+   ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD))
+-    OmitFramePointer := -fomit-frame-pointer
++    OmitFramePointer :=
+   endif
+ 
+   CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index fe87afb..fd9f2c6 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
++++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -25,3 +25,4 @@
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+ #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
++#define LLVM_LIBDIR "@LLVM_LIBDIR@"
+diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
+index b20b6bf..fc56781 100644
+--- a/tools/llvm-config/Makefile
++++ b/tools/llvm-config/Makefile
+@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
+ 	  >> temp.sed
+ 	$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
+ 	  >> temp.sed
++	$(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \
++	  >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
+ 
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 3924e2e..f439c60 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -250,7 +250,7 @@ int main(int argc, char **argv) {
+     ActivePrefix = CurrentExecPrefix;
+     ActiveIncludeDir = ActivePrefix + "/include";
+     ActiveBinDir = ActivePrefix + "/bin";
+-    ActiveLibDir = ActivePrefix + "/lib";
++    ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR;
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
+diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile
+index 268b7bc..e7674f9 100644
+--- a/utils/FileCheck/Makefile
++++ b/utils/FileCheck/Makefile
+@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a
+ TOOL_NO_EXPORTS = 1
+ 
+ # Don't install this utility
+-NO_INSTALL = 1
++#NO_INSTALL = 1
+ 
+ include $(LEVEL)/Makefile.common
+ 
+-- 
+1.8.4.2
+
diff --git a/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
deleted file mode 100644
index b90527a0..00000000
--- a/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
deleted file mode 100644
index 931eb56e..00000000
--- a/sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
deleted file mode 100644
index 0b93deba..00000000
--- a/sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.8.1/clang/darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch
deleted file mode 100644
index ed332f3f..00000000
--- a/sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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.8.1/clang/gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
deleted file mode 100644
index 1f81af0b..00000000
--- a/sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 916572e1243633ddf913c8f32771a3a7f70fd853 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 5 Sep 2014 16:49:35 +0200
-Subject: [PATCH] Support obtaining active toolchain from gcc-config.
-
----
- tools/clang/lib/Driver/ToolChains.cpp | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp
-index b46f69d..2d4374d 100644
---- a/tools/clang/lib/Driver/ToolChains.cpp
-+++ b/tools/clang/lib/Driver/ToolChains.cpp
-@@ -1253,6 +1253,25 @@ Generic_GCC::GCCInstallationDetector::init(
-       Prefixes.push_back("/usr");
-   }
- 
-+  for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
-+    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-+        llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str());
-+    if (File)
-+    {
-+      const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
-+      const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
-+      if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o"))
-+      {
-+        Version = GCCVersion::Parse(VersionText);
-+        GCCInstallPath = GentooPath;
-+        GCCParentLibPath = GCCInstallPath + "/../../..";
-+        GCCTriple.setTriple(CandidateTripleAliases[k]);
-+        IsValid = true;
-+        return;
-+      }
-+    }
-+  }
-+
-   // Loop over the various components which exist and select the best GCC
-   // installation available. GCC installs are ranked by version number.
-   Version = GCCVersion::Parse("0.0.0");
--- 
-2.1.0
-
diff --git a/sys-devel/llvm/files/3.8.1/lldb/six.patch b/sys-devel/llvm/files/3.8.1/lldb/six.patch
deleted file mode 100644
index 324f2b89..00000000
--- a/sys-devel/llvm/files/3.8.1/lldb/six.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.8.1/llvm-config-r1.patch b/sys-devel/llvm/files/3.8.1/llvm-config-r1.patch
deleted file mode 100644
index 38505f15..00000000
--- a/sys-devel/llvm/files/3.8.1/llvm-config-r1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
index 76adf52f..76adf52f 100644
--- a/sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+++ b/sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 968db45a..0ae66bd5 100644
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -1,14 +1,14 @@
-From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001
+From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e 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 07/10] llvm-config: Clean up exported values, update for
- shared linking
+Subject: [PATCH 6/9] 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 --obj-root and --src-root return invalid path (/dev/null),
+- making --src-root return invalid path (/dev/null),
 - making --build-mode return "Release" rather than "Gentoo".
 
 Thanks to Steven Newbury for the initial patch.
@@ -17,8 +17,8 @@ Bug: https://bugs.gentoo.org/565358
 Bug: https://bugs.gentoo.org/501684
 ---
  tools/llvm-config/CMakeLists.txt  | 11 ++++++++---
- tools/llvm-config/llvm-config.cpp | 15 ++++++++++++---
- 2 files changed, 20 insertions(+), 6 deletions(-)
+ 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 744fa4e..593788a 100644
@@ -50,7 +50,7 @@ index 744fa4e..593788a 100644
    set(LLVM_ENABLE_SHARED ON)
  else()
 diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index c63733f..ead11b9 100644
+index c63733f..3162091 100644
 --- a/tools/llvm-config/llvm-config.cpp
 +++ b/tools/llvm-config/llvm-config.cpp
 @@ -522,7 +522,8 @@ int main(int argc, char **argv) {
@@ -63,16 +63,9 @@ index c63733f..ead11b9 100644
        } else if (Arg == "--assertion-mode") {
  #if defined(NDEBUG)
          OS << "OFF\n";
-@@ -538,9 +539,17 @@ int main(int argc, char **argv) {
-       } else if (Arg == "--shared-mode") {
-         PrintSharedMode = true;
+@@ -540,7 +541,11 @@ int main(int argc, char **argv) {
        } else if (Arg == "--obj-root") {
--        OS << ActivePrefix << '\n';
-+        if (IsInDevelopmentTree) {
-+          OS << ActivePrefix << '\n';
-+        } else {
-+          OS << "/dev/null\n";
-+        }
+         OS << ActivePrefix << '\n';
        } else if (Arg == "--src-root") {
 -        OS << LLVM_SRC_ROOT << '\n';
 +        if (IsInDevelopmentTree) {
diff --git a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch b/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
deleted file mode 100644
index 7245af07..00000000
--- a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bcdf2c49b7686046f8a9a5664f0e46117997baf4 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:19:40 +0200
-Subject: [PATCH 09/10] cmake: Use system llvm-lit when lit.py does not exist
- in srcdir
-
-Modify the add_lit_target function to use lit.py from LLVM_MAIN_SRC_DIR
-only when one does exist there, and otherwise fall back to looking for
-system install of llvm-lit. This is based on a similar conditional in
-clang's CMakeLists.txt, and makes it possible to run clang's tests when
-built separately from LLVM with no access to the original sources.
-
-Patch: https://reviews.llvm.org/D23742
----
- cmake/modules/AddLLVM.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
-index 83a2359..87540d5 100644
---- a/cmake/modules/AddLLVM.cmake
-+++ b/cmake/modules/AddLLVM.cmake
-@@ -1081,7 +1081,7 @@ function(add_lit_target target comment)
-   if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
-     list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR})
-   endif ()
--  if (LLVM_MAIN_SRC_DIR)
-+  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
-     set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
-   else()
-     find_program(LIT_COMMAND llvm-lit)
--- 
-2.9.3
-
diff --git a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch b/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
deleted file mode 100644
index 53726aa3..00000000
--- a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 242fd2cbad1075d4cc0e3a3b64652dbc766bd117 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:20:11 +0200
-Subject: [PATCH 10/10] lit/setup.py: Install as llvm-lit (as cmake expects it)
-
-Modify the setup.py for lit to install the entry point as llvm-lit
-(instead of lit) since this is the name expected by functions in
-AddLLVM.cmake.
-
-Patch: https://reviews.llvm.org/D23743
----
- utils/lit/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/lit/setup.py b/utils/lit/setup.py
-index 10de6bb..c57e0aa 100644
---- a/utils/lit/setup.py
-+++ b/utils/lit/setup.py
-@@ -71,7 +71,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit.
-     packages = find_packages(),
-     entry_points = {
-         'console_scripts': [
--            'lit = lit:main',
-+            'llvm-lit = lit:main',
-             ],
-         }
- )
--- 
-2.9.3
-
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 80a47da9..aa802f43 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: b8805b0aacf9a5fc1f30b64e6eb3140889cb3fe5 $
+# $Id: ef041e638b6dd07bba1a71f335f2af3a26a4e48d $
 
 EAPI=6
 
@@ -147,7 +147,7 @@ src_prepare() {
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.0/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
diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index 1114bee1..2ddd2483 100644
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 111706a8203fd0f73093f23f045db1e5bb53c3eb $
+# $Id: 773c35330aed46c3eb47c38c3adf1b402624b832 $
 
 EAPI=6
 
@@ -148,7 +148,7 @@ src_prepare() {
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.0/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
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 92ede2a5..260c1a70 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: 81d3f0fbe2fb593b6b99c2b7ba01192ee05047ac $
+# $Id: 2e81b58da5824a8af7142374ddc44bc132c6efc1 $
 
 EAPI=6
 
@@ -148,7 +148,7 @@ src_prepare() {
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/3.9.0/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
author	Stuart Shelton <stuart@shelton.me>	2016-09-25 02:23:23 +0100
committer	Stuart Shelton <stuart@shelton.me>	2016-09-25 02:23:23 +0100
commit	605220661414f49e08cd8af496da1785f911ee13 (patch)
tree	eedac58221ec92e1470b55114b8b1d4fd62dc457 /sys-devel/llvm
parent	Add dev-lang/perl-5.20.2, dev-lang/perl-5.22.2, dev-lang/perl-5.24.0-r1, upda... (diff)
download	srcshelton-605220661414f49e08cd8af496da1785f911ee13.tar.gz srcshelton-605220661414f49e08cd8af496da1785f911ee13.tar.bz2 srcshelton-605220661414f49e08cd8af496da1785f911ee13.zip