[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/

2016-05-12 Thread Michał Górny 
commit: 8c3d7ed8dfa3e1355338e02c675d3e76d63846b4
Author: Michał Górny  gentoo  org>
AuthorDate: Thu May 12 10:58:07 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu May 12 11:48:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3d7ed8

sys-devel/llvm: Update compiler-rt build patch for current git

 ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 26 ++
 sys-devel/llvm/llvm-.ebuild|  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
b/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
new file mode 100644
index 000..a09de90
--- /dev/null
+++ 
b/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
@@ -0,0 +1,26 @@
+From 380b8faadc3fc66f9aa0528bd3578464b317c31e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Thu, 12 May 2016 08:25:48 +0200
+Subject: [PATCH] cmake: Install compiler-rt to a directory without libdir
+ suffix
+
+---
+ cmake/base-config-ix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
+index 5d0502c..ce16ce9 100644
+--- a/projects/compiler-rt/cmake/base-config-ix.cmake
 b/projects/compiler-rt/cmake/base-config-ix.cmake
+@@ -18,7 +18,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
+   # Setup the paths where compiler-rt runtimes and headers should be stored.
+   set(COMPILER_RT_OUTPUT_DIR 
${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
+   set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+-  set(COMPILER_RT_INSTALL_PATH 
lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
++  set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION})
+   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit 
tests."
+  ${LLVM_INCLUDE_TESTS})
+   option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
+-- 
+2.8.2
+

diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild
index 0b8dddc..dda696c 100644
--- a/sys-devel/llvm/llvm-.ebuild
+++ b/sys-devel/llvm/llvm-.ebuild
@@ -179,7 +179,7 @@ src_prepare() {
# Install clang runtime into /usr/lib/clang
# https://llvm.org/bugs/show_bug.cgi?id=23792
eapply 
"${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
-   eapply 
"${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+   eapply 
"${FILESDIR}"/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
# Make it possible to override CLANG_LIBDIR_SUFFIX
# (that is used only to find LLVMgold.so)

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/

2015-10-27 Thread Bernard Cafarelli 
commit: c920eb1e343b78b6ddf21915654103e12c4c83dc
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Oct 27 18:32:38 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Oct 27 18:32:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c920eb1e

sys-devel/llvm: fix compilation on armv5

Bug #562706 by maekke
compiler-rt forces some -march flags when detecting arm

Package-Manager: portage-2.2.23

 .../cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch   | 16 
 sys-devel/llvm/llvm-3.7.0-r2.ebuild  |  4 
 2 files changed, 20 insertions(+)

diff --git 
a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch 
b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
new file mode 100644
index 000..943a840
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
@@ -0,0 +1,16 @@
+diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 
llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake
+--- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 
2015-07-30 06:28:50.0 +0200
 llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake  2015-10-27 
17:10:47.365847079 +0100
+@@ -209,12 +209,6 @@
+   test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
+   test_target_arch(mips64 "" "-mips64r2" "-mabi=n64")
+ endif()
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm")
+-test_target_arch(arm "" "-march=armv7-a")
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32")
+-test_target_arch(aarch32 "" "-march=armv8-a")
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64")
+-test_target_arch(aarch64 "" "-march=armv8-a")
+   endif()
+   set(COMPILER_RT_OS_SUFFIX "")
+ endif()

diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild 
b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index c63f370..8856b56 100644
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -181,6 +181,10 @@ src_prepare() {
epatch 
"${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
epatch 
"${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
+   # Do not force -march flags on arm platforms
+   # https://bugs.gentoo.org/show_bug.cgi?id=562706
+   epatch 
"${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch
+
# 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

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/

2015-10-12 Thread Bernard Cafarelli 
commit: 77e4cb85f6781ff1bb88bc9b9033f65226673ef7
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Oct 12 18:22:07 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Oct 12 18:22:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e4cb85

sys-devel/llvm: fix some USE=ocaml issues

Bug: 559624
Bug: 562008

Package-Manager: portage-2.2.23

 sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch | 12 
 sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch  |  8 
 sys-devel/llvm/llvm-3.7.0-r2.ebuild |  7 +--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch 
b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
new file mode 100644
index 000..d53ce19
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
@@ -0,0 +1,12 @@
+diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt 
llvm-3.7.0.src/docs/CMakeLists.txt
+--- llvm-3.7.0.src.orig/docs/CMakeLists.txt2015-08-18 18:48:44.0 
+0200
 llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200
+@@ -115,7 +115,7 @@
+ 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

diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch 
b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
index caba3d1..024bad7 100644
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
@@ -14,13 +14,13 @@
  
install(FILES ${install_files}
 -  DESTINATION lib/ocaml)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/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)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
  
foreach( install_file ${install_files} ${install_shlibs} )
  get_filename_component(filename "${install_file}" NAME)
@@ -31,7 +31,7 @@
  
install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
 -  DESTINATION lib/ocaml)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
  endforeach()
 --- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt  2014-12-30 
14:24:07.0 +1100
 +++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt   2015-08-30 
19:23:43.561583624 +1000
@@ -40,4 +40,4 @@
  
  install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
 -DESTINATION lib/ocaml)
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)

diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild 
b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index de885b7..303ce98 100644
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -40,9 +40,10 @@ COMMON_DEPEND="
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
ocaml? (
-   dev-lang/ocaml:0=
+   >=dev-lang/ocaml-4.00.0:0=
dev-ml/findlib
-   dev-ml/ocaml-ctypes )"
+   dev-ml/ocaml-ctypes
+   !!<=sys-devel/llvm-3.7.0-r2[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
dev-lang/perl
@@ -151,6 +152,8 @@ src_prepare() {
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
# Fix libdir for ocaml bindings install, bug #559134
epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+   # Do not build/install ocaml docs with USE=-doc, bug #562008
+   epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch
 
# Make it possible to override Sphinx HTML install dirs
# https://llvm.org/bugs/show_bug.cgi?id=23780

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/

2015-09-02 Thread Bernard Cafarelli 
commit: 9ff44a9a9eaa6b21f61320cb9d8d0781dcea3acf
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Sep  2 09:48:50 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Sep  2 09:49:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff44a9a

sys-devel/llvm: bump to final release

Also fixes WX sections and multilib-strict install forocaml bindings
Both fixes from gienah, bugs #421527 and #559134

Package-Manager: portage-2.2.20.1

 sys-devel/llvm/Manifest| 11 +++---
 .../files/cmake/llvm-3.7.0-ocaml-multilib.patch| 43 ++
 .../{llvm-3.7.0_rc3.ebuild => llvm-3.7.0.ebuild}   | 26 +++--
 sys-devel/llvm/llvm-.ebuild|  7 
 4 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 6f8f423..112f58f 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -6,7 +6,7 @@ DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 
4feb575f74fb3a74b6245400460230141bf610f
 DIST cfe-3.6.0.src.tar.xz 8640776 SHA256 
be0e69378119fe26f0f2f74cffe82b7c26da840c9733fe522ed3c1b66b11082d SHA512 
dc137bdf9c2c5adb25498c995f0b944016699267156a595cc1fe6127f6961d45162275023d194db42691d80fa8fc74f56abad9c145ef1ff492881f547ca76cfe
 WHIRLPOOL 
0df122c9d32dba5a00a97bec4a54b7b7bd8241ef625357bcf9997e3670e7c4775becec971f572073f3ffad86c7ccf616a94c06926ef9b0528248e34958e9b43f
 DIST cfe-3.6.1.src.tar.xz 8616132 SHA256 
74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7 SHA512 
a96944bccfd9341be7adafdcc40367d458e85e7e74b0d2f3a7ea18edf1454d04a232c2d0003d6449c52f81d1e235b434acc1bb63eb5f7d16f8f4a43b70826743
 WHIRLPOOL 
1b4b8bb33fc7dbaeb03f32ba3544580bf0424889705b9d5130127be4d514c6d2aae5e224d71e20595a31441fc4bdd7bbf647e99e57d2c1e17fff3cff9022faa1
 DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 
ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 
ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03
 WHIRLPOOL 
a17419cea32c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8
-DIST cfe-3.7.0rc3.src.tar.xz 9146940 SHA256 
da5507898510903c6f4bb80288980af4baa26234d2eefdcf8fd023738c48c06b SHA512 
2d70499792f869332a3cb253046128577f1c4e87035cafe78a6b4786ace81b080ffe2d6241579e2a695ea0545570cd2a22be7d11e36d32a4530e386fde24d89c
 WHIRLPOOL 
d598aad36613346d93f43463134e9b2aed4cb0fa8687171f5e79684fd5c6294b9eb204f00aca0221bd873f10706929dde39b38faf0475adedb729a2bcc4537d8
+DIST cfe-3.7.0.src.tar.xz 9147204 SHA256 
4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc SHA512 
099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae
 WHIRLPOOL 
1078d962edfb1b90044f19921f64a28c32259e34d983ddf9f9c198d13c8cd0679778a640d7a06c0bf1224d982602294c79a510034276216e3a6de21c739e6c39
 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 
ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 
9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1
 WHIRLPOOL 
c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 
2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 
5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee
 WHIRLPOOL 
10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
 DIST clang-tools-extra-3.5.1.src.tar.xz 215776 SHA256 
e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906 SHA512 
eefacd6857584c9a3186815a7d015a595f32cd926f6c221245d388b8cb9266c52e0980a8e94f01f49c452510fdd42e659b02f116619d3d0e35170566f0704712
 WHIRLPOOL 
a3d14e21f201cc02649833edd67ba04f17c88486fbf399327dbb76d21e151b956a4f58cd7446b8563f72fa1cee06a8bd4abbc53234761a3a69fc1afc99ced87d
@@ -14,7 +14,7 @@ DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 
f21a374d74b194d8c984546266
 DIST clang-tools-extra-3.6.0.src.tar.xz 248688 SHA256 
3aa949ba82913490a75697287d9ee8598c619fae0aa6bb8fddf0095ff51bc812 SHA512 
52e0cd3cce3047bb98d52e5c03ac4a8c549fcdc628f57492727f3e7659b2d4bd29ad98ab4ebab387233911fbb098861ec020b28c051e6b2c17d73dd490beebf3
 WHIRLPOOL 
423f018a2943d16ac605d36bece61046423974c2ffbcc7e4a9aebc5efbb2444ecead70e46bc05f51f4fedbfef338d177b5b16969e8fb0df0bbc911200ce483ae
 DIST clang-tools-extra-3.6.1.src.tar.xz 248592 SHA256 
f4ee70d870d550a9147ac6a548ce7daf7d9e6897348bf411f43c572966fb92b6 SHA512 
3273f8c1fa1683de231d0c0b9371d4b7537381e939fe38996e70a8005a1e6185da459ace2f260fad41df4840b459448ed1498c2fd576dd560005117a54e2ccb9
 WHIRLPOOL 
b35c2118efff758358ed994538

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/

2015-08-24 Thread Bernard Cafarelli 
commit: c8b08cf3c2abeb9e6a893ee8b7006b8a51eb3573
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Aug 24 15:52:56 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Aug 24 15:53:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b08cf3

sys-devel/llvm: fix typo in updated patch

Package-Manager: portage-2.2.20.1

 ...ang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
 
b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
index 0dd976c..cf2ca59 100644
--- 
a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
+++ 
b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
@@ -21,7 +21,7 @@ index f078b37..0c514fc 100644
  llvm::sys::path::append(P, ClangResourceDir);
else
 -llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX,
-+llvm::sys::path::append(P, "..", "lib", "clang",
++llvm::sys::path::append(P, "..", "lib",
  "clang", CLANG_VERSION_STRING);
  
return P.str();

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/

2015-08-24 Thread Bernard Cafarelli 
commit: 5a12ed0f73c8773aaa230e8d66ffce7ea329f866
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Aug 24 15:29:03 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Aug 24 15:30:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a12ed0f

sys-devel/llvm: fix live ebuild

Fixes bugs #553416, #557100 and #557154

 ...g-runtime-into-usr-lib-without-suffix-3.8.patch | 37 ++
 .../llvm-3.8-allow_custom_cmake_build_types.patch  | 14 
 sys-devel/llvm/llvm-3.7.0_rc2.ebuild   |  2 +-
 sys-devel/llvm/llvm-.ebuild|  8 -
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git 
a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
 
b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
new file mode 100644
index 000..0dd976c
--- /dev/null
+++ 
b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
@@ -0,0 +1,37 @@
+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", 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
+@@ -98,4 +98,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
+ install(
+   FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h
+   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/cmake/llvm-3.8-allow_custom_cmake_build_types.patch 
b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
new file mode 100644
index 000..e42c08a
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt   2015-08-12 20:04:55.397881480 +0200
 b/CMakeLists.txt   2015-08-12 20:05:06.625741113 +0200
+@@ -152,11 +152,6 @@
+ 
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ 
+-if (CMAKE_BUILD_TYPE AND
+-NOT uppercase_CMAKE_BUILD_TYPE MATCHES 
"^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: 
${CMAKE_BUILD_TYPE}")
+-endif()
+-
+ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory 
name (32/64)" )
+ 
+ # They are used as destination of target generators.

diff --git a/sys-devel/llvm/llvm-3.7.0_rc2.ebuild 
b/sys-devel/llvm/llvm-3.7.0_rc2.ebuild
index b2ed256..3ea912f 100644
--- a/sys-devel/llvm/llvm-3.7.0_rc2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0_rc2.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.7.0_}/${P/_}.src.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd 
~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="clang debug +doc gold libedit +libffi lldb multitarget ncurses ocaml
python +static-analyzer test xml video_cards_radeon kernel_Darwin"
 

diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild
index aa013b6..a11342a 100644
--- a/sys-devel/llvm/llvm-.ebuild
+++ b/sys-devel/llvm/llvm-.ebuild
@@ -168,6 +168,9 @@ src_prepare() {
# https://llvm.org/bugs/show_bug.cgi?id=18341
epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
 
+   # Allow custom cmake build types (like 'Gentoo')
+   epatch 
"${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+
if use clang; then