gentoo resync : 20.12.2017

3 files changed, 20 insertions, 1 deletions

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index f78e44ed4289..931a4e4eb692 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1,5 +1,6 @@
 AUX beignet-1.2.0_no-hardcoded-cflags.patch 721 BLAKE2B 033bd173462a38e9a35aedb7090adf6c621c040d3a732dfec12c2807a33ffeebbd3dac85a1bfc500f86b997604c6e66d144653cf2ada95b589fac6f6bd4f2600 SHA512 fdb922091986a60a416f9f7be3487e30974e085f8d1fddf0dba2fdcca155d26523c504289d8775e4943acce01bbb7bd3619c1af5e9a43af8afada276a52506e6
 AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e9c9322e43df988267eaa1544b2f896bfc1b0bf333647fff753cc7a2e0ec5715f4251b1c54220590d796e48b8a0d0d1681e30f51247639f3 SHA512 c26772accbd5c2a04f8b8a108b87a518cba5ee4fdd142c7514d67f387080d2d37d6d3e87020b4d44b602dfa0cd6387dad29d5fc1bb75e1d5d090f674f937ddd9
+AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
 AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
 AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
@@ -8,6 +9,6 @@ DIST beignet-1.3.1-source.tar.gz 1136608 BLAKE2B 490b83b0d506c376b2ec38cb9d159c7
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
 EBUILD beignet-1.3.1-r1.ebuild 2473 BLAKE2B aa562dcc1164162dddd40baedb85f1a683330d9371d9269c8fed913a5ee865725821086dbc40e7013274ac7fb346a836830253ea48885a174c91b9d875a40b94 SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148
 EBUILD beignet-1.3.1.ebuild 2468 BLAKE2B 8f35c89e9d5510ba4c93eafe2df0d0913a571603e9df705974916b90409294a0b08ff0d56e692a98ecc2bb4a6bf69dfbfaf300f23a9eb9d0b75590405fd35147 SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c
-EBUILD beignet-1.3.2.ebuild 2559 BLAKE2B fd05b79a5e89bdd9662dd4038136e26959bf2e4bbb1524f503ba204b19f7bdc52a60bca53603b98a5038eb33fc1baf39522c4c2f20c89e43bd4dea438ee840fa SHA512 48cf3d64ed2cc57d6d8f8d08a30a060ed9477a60e589530e749814d356b719864e10866d66fbcb40f1449778178ddf3d79f9727b569c1b821337374db2317ea6
+EBUILD beignet-1.3.2.ebuild 2619 BLAKE2B 55f76d87df46f3cfc391c73297b05ad16d07051cca9b9f23c43ab2213c29ea6ae351faff497450ca3fb884441ed841dcb7cbf67109a43b24cf4b4432ba9f7dfa SHA512 4ef2a187b2711a2fef5bf3ba8217cc301652850fc0ffce0cceae55adbd723fd8547dc284f54b9e148ba6a1802a6152e4464ff81148f7a7e98e06934063da3f51
 EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 16ff04d93f83..95092d080dc6 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -40,6 +40,7 @@ DEPEND="${COMMON}
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
 	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
 	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
 	"${FILESDIR}"/llvm-terminfo.patch
diff --git a/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch b/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch
new file mode 100644
index 000000000000..5add6a1bbda8
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_cmake-llvm-config-multilib.patch
@@ -0,0 +1,17 @@
+--- a/CMake/FindLLVM.cmake
++++ b/CMake/FindLLVM.cmake
+@@ -8,12 +8,12 @@
+ # LLVM_FOUND       - True if llvm found.
+ if (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
++               NAMES $ENV{CHOST}-llvm-config
+                DOC "llvm-config executable"
+                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+ else (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
++               NAMES $ENV{CHOST}-llvm-config
+                DOC "llvm-config executable")
+ endif (LLVM_INSTALL_DIR)
+