Update sys-devel/llvm-3.7.1-r1

3 files changed, 21 insertions, 2 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8385a1b8..887db001 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,6 +11,7 @@ AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d
 AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
 AUX clang-3.6-fbsd-gcc49.patch 1016 SHA256 550862df82d47bd54e8adad7b8ee5bc8eaf14ed4bc100d09ba01d5416ac624b5 SHA512 4d9fcb9626774ea1a06494ee55efb5d6232a33874996a90fa29003ac53f9b9dad2885281a9f9bc15fdf0f0817c351cb6d8a4151e5f6ea12e28d383ded1429018 WHIRLPOOL c0140413a4944989efc5ef9c6ba33d10f43add5e1d8c7a8438cb04c18e764c3db26d65330d6a1570940a93cf4d43de6bb1f5a5640384faed3ea43abfa52b3d5d
 AUX clang-3.6-gentoo-install.patch 1660 SHA256 74cce23945897ce2cfd3931b08695d534973e32a0d104ff942b2f5c500ec4ad7 SHA512 77e2a2dd82fd13292edced8c9bba911579f2b4984a64223e8c80f41b5605220f1433beb6f40e0746163d894d4405296e1f40584eb069f960866df97e6057b569 WHIRLPOOL 4784e8da4e04406a1261c9a539280c90936141b6061e567c70f9e4b566d45e0275b2513d66c03a5473fee6f434e0cf0242e7ac21eafe59a8c26c7c6bf7040876
+AUX clang-3.7-darwin_prefix-include-paths.patch 822 SHA256 1101c8a5ac9e89c20d414a4369e6a0de8b646b58645fee97c0f009ee70824df5 SHA512 93ab156ba618973342a109bc82fb4777db269832875958a11e216e5a5fe1198202bf32d2d7b8ab54a41c452284e0897b990db67c6799d5f438ad0cc43ae8a208 WHIRLPOOL 2751bbcd82222f9826fa99c88e1d9115560fa81f74bc21ec294f628fb8475c4921fec04d84456bbb60042f458451d5a7218100f0da1aa75800c323ff3f62b47f
 AUX clang-3.7-strip_doc_refs.patch 2213 SHA256 5b1e7cc9264d55d3c8213cbf4c6701ad01652da1159ba0bf620cbe7a3382cfdd SHA512 dbe382a64e01c148b6e33734c1b423148584a15037c651cc56691146a1419559006a605c9bfb4ae72d23702ea48f1f40903bd0faf95c1d0ac3c8bd68c4238cdf WHIRLPOOL 5c884f67413af976f1146a2705c1096a7425ca90d13686b9f71f2230447ebe1d1bd39a93e32ef01b4ec6178fbd199b05bcf8d0a6780637914f3bac86955409c3
 AUX cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1404 SHA256 c9692562264ee6a25c3a2f25c990fab763aee36014de3ef95aa1d35a89aa0c0b SHA512 41dfe489adc0a45e4ffd5961c973fe94934d542b1474bb2dba4320b75ed6ff22ce0ac4b590ff20e626ea7c14617c9703ce1fd4d8d6bf1bd3b26ab0adeea373f0 WHIRLPOOL a9d84dc513118cab6310ea46c7b2e67654c81cd3c783d5db8e9ea3657fc1658e80fe4663399d4e35f99294ea9a98fb422e9077a6c8b73a3a98bbc8b282d1e9ad
 AUX cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 954 SHA256 6518c1a1fdce0371aa1a9dab790c0999440e7971ab2613f6d348250ace9310d2 SHA512 e4721c13add5f65126a3d84b9b66ce7086f435c9d2a729edca7bfc3c6f185afb2b5422c7f5045c1a3a4f82c5e3d5616b647bfad9975bb73ecf228235f1d9f588 WHIRLPOOL f35f09b2d29de42dba9c28825af5feec562860f25206589b0a9dcd1daea27c317da1385bdaa5c562b2f4c0613071c3bc1fbfcddece97cd13debaddd14324d552
@@ -94,5 +95,5 @@ EBUILD llvm-3.5.1.ebuild 15777 SHA256 c63945a63f92833887ef7edd5e63e4654ac4402839
 EBUILD llvm-3.5.2.ebuild 15948 SHA256 f89ce760a39d0161e392cf6f1936768da581e27e89ecb67cf435eca4cd043824 SHA512 a676d2a280fd15a5b7ff6d4ac033b5207a748bba66a44ece0bfafe05090bfdf153108df85040cdce0d79627a87ec6c584ec11d054dd1292642435e316cf4d189 WHIRLPOOL c19fe0b796f6be102f48ee339390a736d83cdb4835334e741c9472dcffe78d9d94313aea622fd64ebf611bcda18fc382c2d710236c4ab7ffd25baa71b9461e06
 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 16053 SHA256 4e7c409eb09922cfa55a0b47ddb45c13460996a1164db5c5264eea8bf20437d8 SHA512 466f4edd698b47a19ed822468f206bb5860d6d61d65ca330cb640bc47b17c4648f5ab723e2f3b807613d5a1d5a59cebd145bd3fe187b1f8eef59fa087d7ddb56 WHIRLPOOL 6d698577e2c26fbebacc8a68a58c058722e9a606bc1ce7673be915f47b4116f857bb4f7a6e80018327016024abd5e9ab5fa33dc754734a85d055ba6728f85423
+EBUILD llvm-3.7.1-r1.ebuild 16057 SHA256 b46ca65a1635f16e48c5c6d3a3162a7dfcb9cf3313745c6a5e3964d16de390c7 SHA512 b71074823a6c7aca783a63f44ae8ca9f58ee656bab948154e781174316b7c9e81405310084e760cf1bfa9c5ba74fc29fede8858a2853d24d02db0f0b90f48036 WHIRLPOOL b41ded354f6cdd023b38fa43950aaee71b2721cbef7735702fbad600b2ef547bd3fd0169ec1964568c9d7a611cbc96adf4d88dd65730b1c2044d952000a44817
 EBUILD llvm-3.7.1.ebuild 16125 SHA256 dbe9e049646a46d71bf50ef8e5a91b76cc91103c7b2cc76e497077cbe8bc492c SHA512 dd3c7495e66b50d6b72ae3d8745c0ae3b965cbbeac56775f28148de484f0c781ac821ca730b031be7d9a77d6bbed63323747c2bfcdb4c74e59921bb38ae476ba WHIRLPOOL cd8a617b69ab58dfaf026b6647ad872e32d64adb9189f9a98d3d44242ebb655c07aee3e0bba0cde26d6ddf2d9ce769915406fffba01d68338b32e7e6b9d7e0b3
diff --git a/sys-devel/llvm/files/clang-3.7-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.7-darwin_prefix-include-paths.patch
new file mode 100644
index 00000000..339bfafd
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.7-darwin_prefix-include-paths.patch
@@ -0,0 +1,18 @@
+--- tools/clang/lib/Frontend/InitHeaderSearch.cpp
++++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -220,6 +220,7 @@ void InitHeaderSearch::AddDefaultCInclud
+       if (triple.getEnvironment() != llvm::Triple::Cygnus)
+         break;
+     default:
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
+       // FIXME: temporary hack: hard-coded paths.
+       AddPath("/usr/local/include", System, false);
+       break;
+@@ -469,6 +470,7 @@ void InitHeaderSearch::AddDefaultInclude
+   // 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/llvm-3.7.1-r1.ebuild b/sys-devel/llvm/llvm-3.7.1-r1.ebuild
index 3576e2dc..2c8403af 100644
--- a/sys-devel/llvm/llvm-3.7.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r1.ebuild
@@ -180,7 +180,7 @@ src_prepare() {
 
 		eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch
 
-		eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eapply -p0 "${FILESDIR}"/clang-3.7-darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \